[gnome-taquin/flatpak-nightlies: 3/3] Merge branch 'master' of https://gitlab.gnome.org/GNOME/gnome-taquin into flatpak-nightlies
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-taquin/flatpak-nightlies: 3/3] Merge branch 'master' of https://gitlab.gnome.org/GNOME/gnome-taquin into flatpak-nightlies
- Date: Sun, 20 Jan 2019 17:22:47 +0000 (UTC)
commit f36553153ece77c044fd0b5497fc791dad518d6d
Merge: 781516c 69f640b
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date: Sun Jan 20 18:22:05 2019 +0100
Merge branch 'master' of https://gitlab.gnome.org/GNOME/gnome-taquin into flatpak-nightlies
.gitignore | 1 +
Makefile.am | 12 -
autogen.sh | 47 ---
build-aux/meson_post_install.py | 14 +
.../org.gnome.Taquin.json | 8 +-
configure.ac | 71 -----
data/Makefile.am | 58 ----
data/icons/Makefile.am | 3 -
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
.../{gnome-taquin.png => org.gnome.Taquin.png} | Bin
data/icons/hicolor/Makefile.am | 19 --
.../org.gnome.Taquin-symbolic.svg} | 0
data/icons/meson.build | 15 +
data/meson.build | 59 ++++
...data.xml.in => org.gnome.Taquin.appdata.xml.in} | 24 +-
...quin.desktop.in => org.gnome.Taquin.desktop.in} | 14 +-
...in.gschema.xml => org.gnome.Taquin.gschema.xml} | 6 +-
data/taquin.css | 4 +-
data/themes/Makefile.am | 17 --
data/themes/meson.build | 22 ++
git.mk | 327 ---------------------
help/LINGUAS | 10 +
help/Makefile.am | 20 --
help/meson.build | 23 ++
meson.build | 44 +++
po/POTFILES.in | 11 +-
po/meson.build | 1 +
src/Makefile.am | 44 ---
src/game-window.vala | 2 +-
src/meson.build | 25 ++
src/taquin-main.vala | 12 +-
src/taquin.gresource.xml | 4 +-
src/vapi/libcanberra-gtk3.vapi | 33 +++
37 files changed, 287 insertions(+), 663 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]