[ace-of-penguins] 02/04: Merge tag 'upstream/1.5_rc2'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository ace-of-penguins.

commit 1ef0f6616eb60542f9889d784c4d0803f2526fb2
Merge: a4dfa31 a73c1b7
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 19 20:40:58 2016 +0100

    Merge tag 'upstream/1.5_rc2'
    
    Upstream version 1.5~rc2
    
    # gpg: Signature made Tue 19 Jan 2016 20:40:54 CET 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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ChangeLog        |  5 +++++
 games/.cvsignore | 17 -----------------
 games/spider.c   | 17 +++++++++--------
 lib/.cvsignore   |  9 ---------
 tests/.cvsignore | 10 ----------
 5 files changed, 14 insertions(+), 44 deletions(-)

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