[atanks] 11/13: Merge tag 'upstream/6.5_dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository atanks.

commit 50a94c53db2b86d587995c445120814965f862af
Merge: 40a114f d21a55f
Author: Markus Koschany <apo at debian.org>
Date:   Sat Nov 26 23:48:24 2016 +0100

    Merge tag 'upstream/6.5_dfsg'
    
    Upstream version 6.5~dfsg
    
    # gpg: Signatur vom Sa 26 Nov 2016 23:48:23 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 Changelog             |  10 ++++
 Makefile              |   6 +--
 Makefile.bsd          |   4 +-
 text/ingame.pt_BR.txt | 126 +++++++++++++++++++++++++-------------------------
 4 files changed, 78 insertions(+), 68 deletions(-)

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