Merge lp://staging/~noskcaj/ubuntu/vivid/gnome-weather/3.14 into lp://staging/ubuntu/vivid/gnome-weather
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Tim Lunn |
Merged at revision: | not available |
Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/gnome-weather/3.14 |
Merge into: | lp://staging/ubuntu/vivid/gnome-weather |
Diff against target: |
37405 lines (+12832/-20207) 128 files modified
Makefile.am (+2/-2) Makefile.in (+20/-17) NEWS (+56/-2) aclocal.m4 (+615/-468) config.guess (+97/-64) config.h.in (+0/-15) config.sub (+24/-21) configure (+300/-907) configure.ac (+2/-10) data/Makefile.am (+33/-18) data/Makefile.in (+60/-72) data/application.css (+18/-5) data/city.ui (+192/-57) data/icons/HighContrast/org.gnome.Weather.Application.svg (+158/-0) data/icons/Makefile.am (+16/-7) data/icons/Makefile.in (+26/-20) data/new-location-dialog.ui (+0/-63) data/org.gnome.Weather.Application.appdata.xml.in (+23/-7) data/org.gnome.Weather.Application.data.gresource.xml (+1/-4) data/org.gnome.Weather.Application.gschema.xml (+8/-0) data/org.gnome.Weather.Application.search-provider.ini (+3/-2) data/org.gnome.Weather.Application.service.in (+2/-2) data/org.gnome.Weather.BackgroundService.data.gresource.xml (+8/-0) data/org.gnome.Weather.BackgroundService.service.in (+3/-0) data/places-popover.ui (+226/-0) data/window.ui (+87/-166) debian/changelog (+9/-0) debian/control (+2/-2) debian/copyright (+1/-41) debian/watch (+1/-1) libgd/Makefile.am (+0/-264) libgd/Makefile.in (+0/-1225) libgd/README (+0/-131) libgd/libgd.m4 (+0/-151) libgd/libgd/gd-main-icon-view.c (+0/-425) libgd/libgd/gd-main-icon-view.h (+0/-74) libgd/libgd/gd-main-list-view.c (+0/-347) libgd/libgd/gd-main-list-view.h (+0/-80) libgd/libgd/gd-main-view-generic.c (+0/-320) libgd/libgd/gd-main-view-generic.h (+0/-117) libgd/libgd/gd-main-view.c (+0/-1135) libgd/libgd/gd-main-view.h (+0/-96) libgd/libgd/gd-styled-text-renderer.c (+0/-124) libgd/libgd/gd-styled-text-renderer.h (+0/-79) libgd/libgd/gd-toggle-pixbuf-renderer.c (+0/-263) libgd/libgd/gd-toggle-pixbuf-renderer.h (+0/-75) libgd/libgd/gd-two-lines-renderer.c (+0/-576) libgd/libgd/gd-two-lines-renderer.h (+0/-75) libgd/libgd/gd-types-catalog.c (+0/-142) libgd/libgd/gd-types-catalog.h (+0/-31) libgd/libgd/gd.h (+0/-92) libgd/test-header-bar.c (+0/-71) libgd/test-revealer.c (+0/-33) libgd/test-stack.c (+0/-177) libgd/test-tagged-entry.c (+0/-111) missing (+2/-2) org.gnome.Weather.Application.spec (+0/-58) org.gnome.Weather.spec (+60/-0) po/LINGUAS (+2/-0) po/POTFILES.in (+12/-8) po/ar.po (+108/-92) po/as.po (+272/-263) po/ca.po (+113/-269) po/ca@valencia.po (+113/-269) po/cs.po (+107/-261) po/da.po (+271/-273) po/de.po (+130/-279) po/el.po (+274/-265) po/es.po (+277/-264) po/eu.po (+258/-267) po/fa.po (+271/-239) po/fi.po (+271/-262) po/fr.po (+275/-265) po/gd.po (+283/-269) po/gl.po (+272/-266) po/he.po (+281/-263) po/hu.po (+272/-265) po/id.po (+105/-258) po/it.po (+274/-270) po/ja.po (+263/-241) po/ko.po (+107/-258) po/lt.po (+108/-263) po/lv.po (+281/-263) po/nb.po (+114/-260) po/ne.po (+188/-0) po/pa.po (+284/-267) po/pl.po (+117/-260) po/pt_BR.po (+160/-341) po/ro.po (+386/-0) po/ru.po (+119/-276) po/sk.po (+141/-257) po/sr.po (+281/-264) po/sr@latin.po (+281/-264) po/sv.po (+113/-260) po/th.po (+266/-258) po/uk.po (+280/-267) po/zh_CN.po (+262/-260) po/zh_HK.po (+255/-259) po/zh_TW.po (+266/-261) src/Makefile.am (+31/-16) src/Makefile.in (+52/-68) src/app/city.js (+284/-0) src/app/currentLocationController.js (+154/-0) src/app/forecast.js (+152/-0) src/app/main.js (+157/-0) src/app/weeklyForecast.js (+139/-0) src/app/window.js (+214/-0) src/app/world.js (+213/-0) src/city.js (+0/-190) src/forecast.js (+0/-422) src/main.js (+0/-156) src/misc/params.js (+124/-0) src/misc/util.js (+172/-0) src/org.gnome.Weather.Application.in (+2/-2) src/org.gnome.Weather.Application.src.gresource.xml (+10/-9) src/org.gnome.Weather.BackgroundService.in (+6/-0) src/org.gnome.Weather.BackgroundService.src.gresource.xml (+10/-0) src/package.js (+0/-223) src/params.js (+0/-124) src/searchProvider.js (+0/-198) src/service/main.js (+102/-0) src/service/searchProvider.js (+246/-0) src/shared/world.js (+188/-0) src/strings.js (+0/-70) src/util.js (+0/-153) src/window.js (+0/-354) src/world.js (+0/-317) tests/Makefile.in (+8/-12) |
To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/gnome-weather/3.14 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Lunn (community) | Approve | ||
Ubuntu branches | Pending | ||
Review via email:
|
Description of the change
New upstream release.
To post a comment you must log in.
Thanks