Merge lp://staging/~noskcaj/ubuntu/vivid/xfce4-taskmanager/1.1.0 into lp://staging/ubuntu/vivid/xfce4-taskmanager

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://staging/~noskcaj/ubuntu/vivid/xfce4-taskmanager/1.1.0
Merge into: lp://staging/ubuntu/vivid/xfce4-taskmanager
Diff against target: 29852 lines (+11659/-8060)
81 files modified
.pc/01_configure-kfreebsd.patch/configure.ac (+0/-161)
.pc/01_configure-kfreebsd.patch/src/task-manager-freebsd.c (+0/-243)
.pc/applied-patches (+0/-1)
INSTALL (+3/-3)
Makefile.am (+2/-0)
Makefile.in (+109/-128)
NEWS (+19/-0)
aclocal.m4 (+1302/-1445)
compile (+1/-1)
config.guess (+73/-104)
config.h.in (+6/-0)
config.sub (+39/-39)
configure (+2281/-1101)
configure.ac (+25/-12)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/series (+1/-1)
depcomp (+203/-207)
ltmain.sh (+25/-50)
missing (+265/-150)
mkinstalldirs (+162/-0)
po/POTFILES.in (+2/-0)
po/ar.po (+125/-138)
po/ast.po (+267/-193)
po/bg.po (+115/-113)
po/cs.po (+156/-205)
po/de.po (+111/-119)
po/es.po (+130/-197)
po/fr.po (+137/-133)
po/he.po (+115/-121)
po/hr.po (+113/-118)
po/is.po (+89/-95)
po/it.po (+83/-131)
po/ja.po (+132/-205)
po/ms.po (+345/-0)
po/nb.po (+267/-187)
po/nl.po (+121/-119)
po/pl.po (+101/-107)
po/pt.po (+165/-182)
po/pt_BR.po (+164/-224)
po/ru.po (+88/-95)
po/sl.po (+15/-14)
po/sr.po (+127/-147)
po/sv.po (+76/-127)
po/te.po (+51/-57)
po/th.po (+353/-0)
po/tr.po (+127/-187)
po/uk.po (+114/-112)
po/vi.po (+252/-177)
po/zh_TW.po (+132/-187)
src/Makefile.am (+18/-11)
src/Makefile.in (+135/-148)
src/exec-tool-button.c (+20/-3)
src/main.c (+65/-13)
src/process-monitor.c (+92/-139)
src/process-monitor.h (+1/-2)
src/process-statusbar.c (+49/-40)
src/process-tree-model.c (+931/-0)
src/process-tree-model.h (+31/-0)
src/process-tree-view.c (+95/-19)
src/process-tree-view.h (+2/-0)
src/process-window-gtk3.ui (+225/-0)
src/process-window-gtk3_ui.h (+108/-0)
src/process-window.c (+133/-50)
src/process-window.h (+2/-1)
src/process-window.ui (+126/-40)
src/process-window_ui.h (+91/-49)
src/settings-dialog-gtk3.ui (+453/-0)
src/settings-dialog-gtk3_ui.h (+217/-0)
src/settings-dialog.c (+18/-1)
src/settings-dialog.ui (+27/-14)
src/settings-dialog_ui.h (+128/-121)
src/settings-tool-button.c (+10/-9)
src/settings.c (+10/-1)
src/task-manager-bsd.c (+44/-16)
src/task-manager-freebsd.c (+4/-3)
src/task-manager-linux.c (+2/-2)
src/task-manager-skel.c (+1/-1)
src/task-manager-solaris.c (+1/-0)
src/task-manager.c (+19/-39)
src/task-manager.h (+3/-1)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/vivid/xfce4-taskmanager/1.1.0
Reviewer Review Type Date Requested Status
Daniel Holbach Needs Fixing
Review via email: mp+245535@code.staging.launchpad.net

Description of the change

New upstream release.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Text conflict in src/task-manager-freebsd.c
1 conflicts encountered.

review: Needs Fixing

Unmerged revisions

11. By Jackson Doak

* New upstream release.
* Disable the kfreebsd patch, it needs refreshing, but we don't need it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: