This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit d3b969fb4d01fbc5099d766710237506c219c7fe
Merge: 17d47e9 2a0c2c3
Author: krzys_h <krzy...@interia.pl>
Date: Sat Nov 4 11:27:14 2017 +0100
Merge pull request #992 from DavivaD/dev-dmgalarm-st2
Damage Alarm Implementation (2th Stage)
src/object/interface/damageable_object.h | 7 +++++++
src/object/old_object.cpp | 27 ++++++++++++++++++++++++++-
src/object/old_object.h | 5 +++++
src/ui/controls/control.h | 3 ++-
src/ui/controls/shortcut.cpp | 21 +++++++++++++++++++++
src/ui/mainshort.cpp | 1 +
6 files changed, 62 insertions(+), 2 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
