Merge lp://staging/~noskcaj/ubuntu/trusty/gnome-themes-standard/3.10 into lp://staging/ubuntu/trusty/gnome-themes-standard
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merge reported by: | Iain Lane |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/gnome-themes-standard/3.10 |
| Merge into: | lp://staging/ubuntu/trusty/gnome-themes-standard |
| Diff against target: |
26973 lines (+12699/-10365) 59 files modified
.pc/01_gtk-update-icon-cache_name.patch/configure.ac (+0/-92) .pc/applied-patches (+0/-2) .pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in (+0/-7) ChangeLog (+1667/-124) Makefile.am (+2/-0) Makefile.in (+9/-6) NEWS (+53/-14) aclocal.m4 (+6/-8806) compile (+310/-0) configure (+19/-11) configure.ac (+11/-4) debian/changelog (+20/-0) debian/control (+2/-2) debian/control.in (+1/-1) debian/patches/01_gtk-update-icon-cache_name.patch (+5/-1) m4/intltool.m4 (+237/-0) m4/libtool.m4 (+7986/-0) m4/ltoptions.m4 (+384/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+98/-0) mkinstalldirs (+162/-0) po/LINGUAS (+1/-0) po/ga.po (+39/-0) themes/Adwaita/Makefile.in (+7/-3) themes/Adwaita/backgrounds/Makefile.in (+7/-3) themes/Adwaita/backgrounds/adwaita-timed.xml (+9/-9) themes/Adwaita/cursors/Makefile.am (+1/-1) themes/Adwaita/cursors/Makefile.in (+8/-4) themes/Adwaita/gtk-2.0/Makefile.in (+6/-3) themes/Adwaita/gtk-2.0/adwaita_engine.c (+0/-1) themes/Adwaita/gtk-3.0/Makefile.in (+6/-3) themes/Adwaita/gtk-3.0/gnome-applications-dark-overrides.css (+2/-2) themes/Adwaita/gtk-3.0/gnome-applications.css (+116/-89) themes/Adwaita/gtk-3.0/gtk-main-common.css (+11/-12) themes/Adwaita/gtk-3.0/gtk-main-dark.css (+10/-5) themes/Adwaita/gtk-3.0/gtk-main.css (+12/-7) themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css (+62/-127) themes/Adwaita/gtk-3.0/gtk-widgets-assets.css (+62/-127) themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css (+2/-2) themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css (+42/-17) themes/Adwaita/gtk-3.0/gtk-widgets-borders.css (+42/-17) themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css (+29/-30) themes/Adwaita/gtk-3.0/gtk-widgets.css (+398/-216) themes/Adwaita/gtk-3.0/gtk.gresource.xml (+256/-113) themes/Adwaita/index.theme (+2/-0) themes/Adwaita/metacity-1/Makefile.in (+7/-3) themes/Adwaita/metacity-1/metacity-theme-3.xml (+217/-436) themes/HighContrast/Makefile-icons.am (+6/-6) themes/HighContrast/Makefile.in (+13/-9) themes/HighContrast/gtk-2.0/Makefile.in (+7/-3) themes/HighContrast/gtk-3.0/Makefile.in (+7/-3) themes/HighContrast/gtk-3.0/gtk-widgets.css (+139/-33) themes/HighContrast/icons/Makefile.in (+7/-3) themes/HighContrast/icons/index.theme (+31/-1) themes/HighContrast/icons/index.theme.in (+1/-1) themes/HighContrast/index.theme (+2/-0) themes/HighContrast/metacity-1/Makefile.in (+7/-3) themes/Makefile.in (+7/-3) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/gnome-themes-standard/3.10 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian experimental
To post a comment you must log in.
Revision history for this message
| Dmitry Shachnev (mitya57) wrote | # |
Revision history for this message
| Iain Lane (laney) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
It is done. I also merged to the ubuntu-desktop branch.