[gnome-software/wip/rancell/paid: 25/25] Merge branch 'master' into wip/rancell/paid



commit 1e08274f850290ecd2cc8afe7d72f65deedb88e3
Merge: 99eb789 5bfcc90
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed May 4 17:03:12 2016 +1200

    Merge branch 'master' into wip/rancell/paid

 configure.ac                                   |    2 +-
 data/org.gnome.software.gschema.xml            |   10 +-
 data/tests/build-cab.sh                        |    4 +
 data/tests/chiron-0.2.cab                      |  Bin 0 -> 34376 bytes
 data/tests/firmware.dfu                        |  Bin 0 -> 32784 bytes
 data/tests/firmware.dfu.asc                    |   11 +
 data/tests/firmware.metainfo.xml               |   30 +
 po/es.po                                       | 1075 ++++++++++++++++++------
 po/fur.po                                      |  867 +++++++++++++++----
 po/gd.po                                       |  480 +++++------
 po/hu.po                                       |  321 ++++----
 po/pt_BR.po                                    |  690 ++++++++--------
 src/Makefile.am                                |    1 +
 src/gs-app.c                                   |    4 +-
 src/gs-app.h                                   |    1 +
 src/gs-application.c                           |    2 +-
 src/gs-dbus-helper.c                           |    3 +-
 src/gs-plugin.c                                |    3 +-
 src/gs-screenshot-image.c                      |   41 +-
 src/gs-self-test.c                             |   54 ++
 src/gs-shell-details.c                         |    3 +-
 src/gs-utils.c                                 |   94 ++-
 src/gs-utils.h                                 |   15 +-
 src/gtk-style-hc.css                           |    4 +-
 src/gtk-style.css                              |    6 +-
 src/plugins/Makefile.am                        |   10 +-
 src/plugins/gs-appstream.c                     |   28 +-
 src/plugins/gs-plugin-appstream.c              |   35 +-
 src/plugins/gs-plugin-dummy.c                  |    8 +-
 src/plugins/gs-plugin-fedora-distro-upgrades.c |   11 +-
 src/plugins/gs-plugin-fwupd.c                  |   91 ++-
 src/plugins/gs-plugin-odrs.c                   |   36 +-
 src/plugins/gs-plugin-provenance-license.c     |  167 ++++
 src/plugins/gs-plugin-provenance.c             |   24 +-
 src/plugins/gs-plugin-shell-extensions.c       |   13 +-
 src/plugins/gs-plugin-steam.c                  |   25 +-
 36 files changed, 2837 insertions(+), 1332 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]