Merge lp://staging/~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15 into lp://staging/ubuntu/vivid/gnome-system-monitor
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merged at revision: | 110 |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15 |
| Merge into: | lp://staging/ubuntu/vivid/gnome-system-monitor |
| Diff against target: |
17031 lines (+5266/-6120) 117 files modified
.pc/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch/src/interface.cpp (+0/-781) .pc/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch/src/interface.cpp (+0/-767) .pc/applied-patches (+0/-2) ChangeLog (+138/-18) Makefile.am (+0/-5) Makefile.in (+39/-83) NEWS (+31/-12) aclocal.m4 (+2/-2) configure (+12/-12) configure.ac (+1/-1) data/interface.ui (+1/-0) debian/changelog (+8/-0) debian/control (+3/-2) debian/control.in (+3/-2) debian/patches/0001-Don-t-set-titlebar-class-when-using-headerbar-widget.patch (+0/-26) debian/patches/0001-Use-traditional-titlebars-on-GNOME-DE-s.patch (+0/-45) debian/patches/series (+0/-2) gnome-system-monitor-kde.desktop.in (+1/-1) gnome-system-monitor.desktop.in (+1/-1) help/cs/cs.po (+1/-1) help/cs/legal.xml (+1/-3) help/de/commandline.page (+0/-6) help/de/mem-check.page (+0/-7) help/de/mem-swap.page (+0/-6) help/de/memory-map-use.page (+0/-5) help/de/net-bits.page (+0/-5) help/de/process-explain.page (+0/-7) help/de/process-identify-file.page (+0/-6) help/de/process-identify-hog.page (+0/-7) help/de/process-update-speed.page (+0/-7) help/de/solaris-mode.page (+0/-6) help/de/units.page (+0/-5) help/el/commandline.page (+0/-6) help/el/mem-check.page (+0/-7) help/el/mem-swap.page (+0/-6) help/el/memory-map-use.page (+0/-5) help/el/net-bits.page (+0/-5) help/el/process-explain.page (+0/-7) help/el/process-identify-file.page (+0/-6) help/el/process-identify-hog.page (+0/-7) help/el/process-update-speed.page (+0/-7) help/el/solaris-mode.page (+0/-6) help/el/units.page (+0/-5) help/es/commandline.page (+0/-6) help/es/mem-check.page (+0/-7) help/es/mem-swap.page (+0/-6) help/es/memory-map-use.page (+0/-5) help/es/net-bits.page (+0/-5) help/es/process-explain.page (+0/-7) help/es/process-identify-file.page (+0/-6) help/es/process-identify-hog.page (+0/-7) help/es/process-update-speed.page (+0/-7) help/es/solaris-mode.page (+0/-6) help/es/units.page (+0/-5) help/fr/commandline.page (+0/-6) help/fr/mem-check.page (+0/-7) help/fr/mem-swap.page (+0/-6) help/fr/memory-map-use.page (+0/-5) help/fr/net-bits.page (+0/-5) help/fr/process-explain.page (+0/-7) help/fr/process-identify-file.page (+0/-6) help/fr/process-identify-hog.page (+0/-7) help/fr/process-update-speed.page (+0/-7) help/fr/solaris-mode.page (+0/-6) help/fr/units.page (+0/-5) help/hu/commandline.page (+0/-6) help/hu/mem-check.page (+0/-7) help/hu/mem-swap.page (+0/-6) help/hu/memory-map-use.page (+0/-5) help/hu/net-bits.page (+0/-5) help/hu/process-explain.page (+0/-7) help/hu/process-identify-file.page (+0/-6) help/hu/process-identify-hog.page (+0/-7) help/hu/process-update-speed.page (+0/-7) help/hu/solaris-mode.page (+0/-6) help/hu/units.page (+0/-5) help/ro/commandline.page (+0/-6) help/ro/mem-check.page (+0/-7) help/ro/mem-swap.page (+0/-6) help/ro/memory-map-use.page (+0/-5) help/ro/net-bits.page (+0/-5) help/ro/process-explain.page (+0/-7) help/ro/process-identify-file.page (+0/-6) help/ro/process-identify-hog.page (+0/-7) help/ro/process-update-speed.page (+0/-7) help/ro/solaris-mode.page (+0/-6) help/ro/units.page (+0/-5) po/LINGUAS (+1/-0) po/bg.po (+3/-3) po/bn_IN.po (+1/-1) po/fi.po (+2/-2) po/gu.po (+500/-573) po/kk.po (+1309/-0) po/pt.po (+235/-216) po/sr.po (+247/-299) po/sr@latin.po (+247/-299) po/te.po (+17/-46) po/uk.po (+1/-1) po/vi.po (+724/-787) src/Makefile.am (+0/-1) src/Makefile.in (+2/-4) src/application.h (+50/-5) src/argv.cpp (+1/-0) src/disks.cpp (+32/-40) src/gsm-resources.c (+1578/-1573) src/iconthemewrapper.cpp (+0/-57) src/iconthemewrapper.h (+0/-26) src/load-graph.cpp (+6/-1) src/load-graph.h (+3/-0) src/lsof.cpp (+7/-1) src/memmaps.cpp (+5/-1) src/prettytable.cpp (+11/-7) src/prettytable.h (+0/-3) src/proctable.cpp (+20/-4) src/smooth_refresh.cpp (+8/-2) src/smooth_refresh.h (+3/-0) src/util.h (+11/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
| Iain Lane | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream release. Appears to be bugfix only, upstreams our current patches.
To post a comment you must log in.
Revision history for this message
| Iain Lane (laney) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Revision history for this message
| Iain Lane (laney) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
It's probably okay, but do you know what upstream's plans are for the rest of the gnome release cycle?