[gtk: 8/8] Merge branch 'appnames' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 8/8] Merge branch 'appnames' into 'master'
- Date: Tue, 2 Apr 2019 00:54:30 +0000 (UTC)
commit 5b6031f7e4396a1f72fee5605bf4299ca981b715
Merge: aacab81a3e e54e72b290
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Apr 2 00:54:11 2019 +0000
Merge branch 'appnames' into 'master'
Rename apps for uniqueness
See merge request GNOME/gtk!699
.gitlab-ci.yml | 9 ++-
.../{org.gtk.Demo.json => org.gtk.Demo4.json} | 7 +--
build-aux/flatpak/org.gtk.IconBrowser4.json | 72 ++++++++++++++++++++++
...getFactory.json => org.gtk.WidgetFactory4.json} | 7 +--
build-aux/meson/post-install.py | 2 +-
demos/gtk-demo/application.c | 10 +--
demos/gtk-demo/application_demo.c | 6 +-
.../apps/{org.gtk.Demo.svg => org.gtk.Demo4.svg} | 0
...emo-symbolic.svg => org.gtk.Demo4-symbolic.svg} | 2 +-
demos/gtk-demo/demo.gresource.xml | 2 +-
demos/gtk-demo/main.c | 4 +-
demos/gtk-demo/meson.build | 6 +-
....Demo.appdata.xml => org.gtk.Demo4.appdata.xml} | 2 +-
...{org.gtk.Demo.desktop => org.gtk.Demo4.desktop} | 2 +-
....Demo.gschema.xml => org.gtk.Demo4.gschema.xml} | 6 +-
demos/gtk-demo/sidebar.c | 2 +-
demos/gtk-demo/stack.ui | 2 +-
...me.IconBrowser.svg => org.gtk.IconBrowser4.svg} | 0
...bolic.svg => org.gtk.IconBrowser4-symbolic.svg} | 2 +-
demos/icon-browser/iconbrowserapp.c | 2 +-
demos/icon-browser/meson.build | 2 +-
...rowser.desktop => org.gtk.IconBrowser4.desktop} | 2 +-
...idgetFactory.svg => org.gtk.WidgetFactory4.svg} | 0
...lic.svg => org.gtk.WidgetFactory4-symbolic.svg} | 0
demos/widget-factory/meson.build | 4 +-
...data.xml => org.gtk.WidgetFactory4.appdata.xml} | 2 +-
...tory.desktop => org.gtk.WidgetFactory4.desktop} | 2 +-
demos/widget-factory/widget-factory.c | 8 +--
demos/widget-factory/widget-factory.gresource.xml | 8 +--
demos/widget-factory/widget-factory.ui | 2 +-
gtk/gtkwindow.c | 4 +-
gtk/meson.build | 2 +-
...ema.xml => org.gtk.Settings.Debug4.gschema.xml} | 2 +-
33 files changed, 129 insertions(+), 54 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]