This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository lgeneral.
commit 82896ae31eaf7674ce6da67ac501d8153c237823 Merge: ec6ec70 df4bfe8 Author: Markus Koschany <[email protected]> Date: Tue Mar 17 09:39:01 2015 +0100 Merge tag 'upstream/1.2.6' Upstream version 1.2.6 # gpg: Signature made Tue 17 Mar 2015 09:38:57 CET using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] AUTHORS | 14 ++- ChangeLog | 12 +++ Makefile.am | 13 +-- Makefile.in | 13 +-- TODO | 22 +---- configure | 2 +- configure.in | 2 +- lgc-pg/convdata/Makefile.am | 2 +- lgc-pg/convdata/Makefile.in | 2 +- lgc-pg/maps.c | 18 ++-- lgc-pg/misc.c | 4 +- lgc-pg/misc.h | 5 ++ lgc-pg/parser.c | 4 +- lgc-pg/scenarios.c | 78 ++++++++-------- lgc-pg/shp.c | 46 +++++----- lgc-pg/units.c | 58 ++++++------ lgeneral-redit/src/parser.c | 9 +- lgeneral.desktop | 9 ++ lgeneral.desktop.in | 7 -- lgeneral48.png => lgeneral.png | Bin lgeneral16.png | Bin 437 -> 0 bytes lgeneral32.png | Bin 1170 -> 0 bytes src/action.h | 4 +- src/engine.c | 200 ++++++++++++++++++++++++----------------- src/main.c | 12 ++- src/map.c | 32 ++----- src/misc.h | 5 ++ src/parser.c | 4 +- src/scenario.c | 3 +- src/slot.c | 38 +++++--- 30 files changed, 324 insertions(+), 294 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgeneral.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
