[gnome-weather/wip/snwh/app-icon-redesign: 14/14] Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-weather into wip/snwh/app-icon-redesign
- From: Sam Hewitt <snwh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-weather/wip/snwh/app-icon-redesign: 14/14] Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-weather into wip/snwh/app-icon-redesign
- Date: Sun, 9 Dec 2018 17:37:10 +0000 (UTC)
commit 231d135538dd31972073906f950b6303dfab358b
Merge: 29c3b47 80386a5
Author: Sam Hewitt <sam snwh org>
Date: Sun Dec 9 12:35:04 2018 -0500
Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-weather into wip/snwh/app-icon-redesign
configure.ac | 2 +-
data/app-menu.ui | 28 -------
...rg.gnome.Weather.Application.data.gresource.xml | 2 +-
data/primary-menu.ui | 23 ++++++
data/window.ui | 22 ++++++
gnome-weather.doap | 17 ++++
org.gnome.Weather-unstable.json | 9 ++-
po/POTFILES.in | 2 +-
po/eo.po | 41 +++++-----
po/es.po | 92 +++++++++++-----------
po/fr.po | 68 ++++++++--------
po/sl.po | 87 ++++++++++----------
src/app/main.js | 11 +--
src/app/window.js | 7 ++
14 files changed, 220 insertions(+), 191 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]