[lordsawar] 02/04: Merge tag 'upstream/0.3.0'

[Markus Koschany]

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

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

commit 4bf75544742661bd881ab46fc86e4a8aeca9bd4c
Merge: ecbbdf4 38d9da9
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Jul 4 13:58:18 2015 +0200

    Merge tag 'upstream/0.3.0'
    
    Upstream version 0.3.0
    
    # gpg: Signature made Sat 04 Jul 2015 13:58:14 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]

 ABOUT-NLS                           | 1282 ------------------
 Makefile.in                         |   26 +-
 aclocal.m4                          |  258 +++-
 autogen.sh                          |    6 +-
 config.h.in                         |   17 +-
 config.rpath                        |  690 ----------
 configure                           | 2432 ++---------------------------------
 configure.ac                        |   14 +-
 dat/Makefile.am                     |    6 +-
 dat/Makefile.in                     |   82 +-
 dat/army/Makefile.in                |   21 +-
 dat/army/bigdefault/Makefile.in     |   21 +-
 dat/army/default/Makefile.in        |   21 +-
 dat/army/duel/Makefile.in           |   21 +-
 dat/citysets/Makefile.in            |   21 +-
 dat/citysets/bigdefault/Makefile.in |   21 +-
 dat/citysets/bigdol/Makefile.in     |   21 +-
 dat/citysets/default/Makefile.in    |   21 +-
 dat/citysets/dol/Makefile.in        |   21 +-
 dat/glade/Makefile.in               |   21 +-
 dat/glade/about-dialog.ui           |   17 +-
 dat/glade/editor/Makefile.in        |   21 +-
 dat/icons/32x32/Makefile.in         |   21 +-
 dat/icons/64x64/Makefile.in         |   21 +-
 dat/icons/Makefile.in               |   21 +-
 dat/lordsawar-appdata.xml           |   18 +
 dat/lordsawar-editor.desktop.in.in  |    3 +-
 dat/lordsawar-editor.rc             |    1 +
 dat/lordsawar.desktop.in.in         |    3 +-
 dat/lordsawar.rc                    |    1 +
 dat/map/Makefile.in                 |   21 +-
 dat/map/dol/Makefile.in             |   21 +-
 dat/map/duel/Makefile.in            |   21 +-
 dat/music/Makefile.in               |   21 +-
 dat/shield/Makefile.in              |   21 +-
 dat/shield/default/Makefile.in      |   21 +-
 dat/shield/dol/Makefile.in          |   21 +-
 dat/shield/plain/Makefile.in        |   21 +-
 dat/tilesets/Makefile.in            |   21 +-
 dat/tilesets/bigdefault/Makefile.in |   21 +-
 dat/tilesets/bigstark/Makefile.in   |   21 +-
 dat/tilesets/bigwesnoth/Makefile.in |   21 +-
 dat/tilesets/default/Makefile.in    |   21 +-
 dat/tilesets/stark/Makefile.in      |   21 +-
 dat/tilesets/wesnoth/Makefile.in    |   21 +-
 dat/various/Makefile.am             |    4 +
 dat/various/Makefile.in             |   25 +-
 dat/various/castle_icon.ico         |  Bin 0 -> 67646 bytes
 dat/various/editor/Makefile.in      |   21 +-
 dat/various/items/Makefile.in       |   21 +-
 dat/various/tileset_icon.ico        |  Bin 0 -> 67646 bytes
 dat/various/xslt/Makefile.in        |   21 +-
 doc/Makefile.in                     |   21 +-
 help/Makefile.in                    |   21 +-
 help/figures/Makefile.in            |   21 +-
 m4/gettext.m4                       |  401 ------
 m4/iconv.m4                         |  268 ----
 m4/intlmacosx.m4                    |   56 -
 m4/intltool.m4                      |  237 ----
 m4/lib-ld.m4                        |  119 --
 m4/lib-link.m4                      |  777 -----------
 m4/lib-prefix.m4                    |  224 ----
 m4/nls.m4                           |   32 -
 m4/po.m4                            |  453 -------
 m4/progtest.m4                      |   91 --
 make-windows-zip.sh.in              |    2 +
 po/lordsawar.pot                    |   20 +-
 src/ImageCache.cpp                  |   25 +
 src/ImageCache.h                    |   10 +
 src/Makefile.am                     |   15 +-
 src/Makefile.in                     |   67 +-
 src/editor/Makefile.am              |   13 +-
 src/editor/Makefile.in              |  109 +-
 src/editor/editorbigmap.cpp         |  128 +-
 src/editor/editorbigmap.h           |    3 +-
 src/ghs/Makefile.am                 |    6 +-
 src/ghs/Makefile.in                 |   27 +-
 src/gls/Makefile.am                 |    6 +-
 src/gls/Makefile.in                 |   27 +-
 src/gui/Makefile.in                 |   21 +-
 src/prodslotlist.cpp                |    2 +-
 81 files changed, 883 insertions(+), 7876 deletions(-)

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