[blockattack] 02/08: Merge tag 'upstream/2.0.1'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository blockattack.

commit d46f696c095e08368e6422db0c707f8068e35032
Merge: a7c128d d494c42
Author: Markus Koschany <apo at debian.org>
Date:   Tue Oct 4 16:55:37 2016 +0200

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1
    
    # gpg: Signatur vom Di 04 Okt 2016 16:55:36 CEST
    # gpg:                mittels RSA-Schlüssel D9AD14B9513B51E4
    # 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]

 ReleaseNotes-2.0.1.txt               | 12 ++++++++++++
 man/blockattack.man                  |  8 ++++----
 source/code/main.cpp                 |  2 +-
 source/code/version.h                |  2 +-
 windows installer/install_script.nsi |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

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