[gtkatlantic] 04/11: Merge tag 'upstream/0.6.0'

Markus Koschany apo-guest at moszumanska.debian.org
Fri Jul 17 22:18:33 UTC 2015


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository gtkatlantic.

commit 7f030aa06cde9e2ce4b7dd2cadf675f93407aa9c
Merge: c072a83 a81efa5
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Jul 17 23:23:41 2015 +0200

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    # gpg: Signature made Fri 17 Jul 2015 23:23:37 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 COPYING                                            |    41 +-
 ChangeLog                                          |    15 +
 Makefile.am                                        |    35 +-
 Makefile.in                                        |    91 +-
 NEWS                                               |    15 +
 README                                             |     2 +-
 aclocal.m4                                         |    55 +
 autogen.sh                                         |   106 -
 autom4te.cache/output.0                            | 15264 -------------------
 autom4te.cache/output.1                            | 15260 ------------------
 autom4te.cache/requests                            |   266 -
 autom4te.cache/traces.0                            |  1861 ---
 autom4te.cache/traces.1                            |   631 -
 clean_gtkatlantic                                  |    30 -
 config.guess                                       |   192 +-
 config.h.in                                        |     3 -
 config.sub                                         |    30 +-
 configure                                          |    32 +-
 configure.in                                       |    25 +-
 data/Makefile.am                                   |    19 +
 Makefile.in => data/Makefile.in                    |   297 +-
 data/icon16x16.ico                                 |   Bin 1406 -> 0 bytes
 data/icon16x16.xpm                                 |   113 -
 data/icon32x32.ico                                 |   Bin 2238 -> 0 bytes
 data/icon32x32.xpm                                 |   169 -
 data/icon_128x128.png                              |   Bin 0 -> 18262 bytes
 data/icon_16x16.png                                |   Bin 0 -> 608 bytes
 data/icon_32x32.png                                |   Bin 0 -> 2252 bytes
 data/icon_48x48.png                                |   Bin 0 -> 4210 bytes
 data/icon_64x64.png                                |   Bin 0 -> 6532 bytes
 data/interface.xml                                 |     5 -
 data/logo.png                                      |   Bin 134159 -> 0 bytes
 data/themes/Makefile.am                            |    13 +
 data/themes/Makefile.in                            |   371 +
 {themes => data/themes}/generic_gradient/cards.png |   Bin
 .../themes}/generic_gradient/estates.png           |   Bin
 .../themes}/generic_gradient/houses.png            |   Bin
 .../themes}/generic_gradient/pattern.png           |   Bin
 .../themes}/generic_gradient/preview.png           |   Bin
 {themes => data/themes}/generic_gradient/stars.png |   Bin
 .../themes}/generic_gradient/stars_m.png           |   Bin
 .../themes}/generic_gradient/theme.conf            |     0
 .../themes}/generic_gradient/tokens.png            |   Bin
 gtkatlantic.desktop                                |    10 +
 gtkatlantic.xpm                                    |   545 +
 ltmain.sh                                          |     4 +-
 m4/libtool.m4                                      |  7997 ----------
 m4/ltoptions.m4                                    |   384 -
 m4/ltsugar.m4                                      |   123 -
 m4/ltversion.m4                                    |    23 -
 m4/lt~obsolete.m4                                  |    98 -
 src/Makefile.am                                    |    37 +-
 src/Makefile.in                                    |    55 +-
 src/callback.c                                     |   594 +-
 src/callback.h                                     |    29 +-
 src/client.c                                       |   388 +-
 src/client.h                                       |    21 +-
 src/display.c                                      |    91 +-
 src/display.h                                      |    11 +-
 src/eng_frame.c                                    |    42 +-
 src/eng_frame.h                                    |    23 +-
 src/eng_list.c                                     |     9 +-
 src/eng_list.h                                     |    20 +-
 src/eng_main.c                                     |     8 +-
 src/eng_main.h                                     |    24 +-
 src/engine.h                                       |    23 +-
 src/game.c                                         |   845 +-
 src/game.h                                         |    33 +-
 src/global.h                                       |   152 +-
 src/icon.xpm                                       |   169 -
 src/interface.c                                    |  1685 +-
 src/interface.h                                    |    32 +-
 src/load.c                                         |   177 +-
 src/load.h                                         |    13 +-
 src/main.c                                         |    19 +-
 src/parser.c                                       |     8 +-
 src/parser.h                                       |    11 +-
 src/readpng.c                                      |     8 +-
 src/readpng.h                                      |    11 +-
 src/theme.c                                        |   146 +-
 src/theme.h                                        |    11 +-
 src/trade.c                                        |   142 +-
 src/trade.h                                        |    11 +-
 src/xmlparse.c                                     |  1386 +-
 src/xmlparse.h                                     |    59 +-
 85 files changed, 4188 insertions(+), 46230 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gtkatlantic.git



More information about the Pkg-games-commits mailing list