[blockattack] 02/05: Updated version 2.1.2 from 'upstream/2.1.2'

[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 79c26f7a6b351c2b3d4aafff3a6fb97c98f8086d
Merge: 92a6e6a e652ecf
Author: Markus Koschany <apo at debian.org>
Date:   Sun Aug 20 03:14:45 2017 +0200

    Updated version 2.1.2 from 'upstream/2.1.2'
    
    with Debian dir 5a89b8cb5ae89c3d678e38d5e7ceca05d22b823d

 CMakeLists.txt                             | 4 ++--
 ReleaseNotes-2.1.2.txt                     | 4 ++++
 man/blockattack.man                        | 4 ++--
 source/code/os.cpp                         | 1 +
 source/code/version.h                      | 2 +-
 source/misc/docker/Dockerfile.WindoesBuild | 2 +-
 windows installer/install_script.nsi       | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

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