[gtkatlantic] 05/07: Merge tag 'upstream/0.6.1'

[Markus Koschany]

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

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

commit d8dadbd3f23680f45e2db92934aa8a07d32a262c
Merge: 497f825 67e2ce8
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Aug 12 11:21:19 2015 +0200

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1
    
    # gpg: Signature made Wed 12 Aug 2015 11:21:16 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]

 ChangeLog                                          |    5 +
 Makefile.am                                        |    1 -
 Makefile.in                                        |    8 +-
 NEWS                                               |    5 +
 README                                             |    2 +-
 aclocal.m4                                         | 8607 +-------------------
 config.h.in                                        |    3 +
 configure                                          |   43 +-
 configure.in                                       |   25 +-
 data/Makefile.am                                   |   23 +-
 data/Makefile.in                                   |  180 +-
 .../128x128/gtkatlantic.png}                       |  Bin
 .../16x16/gtkatlantic.png}                         |  Bin
 .../32x32/gtkatlantic.png}                         |  Bin
 .../icons/32x32/gtkatlantic.xpm                    |    0
 .../48x48/gtkatlantic.png}                         |  Bin
 .../64x64/gtkatlantic.png}                         |  Bin
 data/themes/Makefile.in                            |    6 +-
 aclocal.m4 => m4/libtool.m4                        | 1749 +---
 m4/ltoptions.m4                                    |  384 +
 m4/ltsugar.m4                                      |  123 +
 m4/ltversion.m4                                    |   23 +
 m4/lt~obsolete.m4                                  |   98 +
 src/Makefile.in                                    |    6 +-
 src/callback.c                                     |   39 +-
 src/client.h                                       |    2 +-
 src/display.h                                      |    2 +-
 src/global.h                                       |   13 +-
 src/interface.c                                    |   10 +-
 src/load.c                                         |   10 +-
 src/load.h                                         |    2 +-
 src/readpng.c                                      |    6 +-
 src/theme.c                                        |   10 +-
 33 files changed, 968 insertions(+), 10417 deletions(-)

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