[colobot] 41/145: Merge part of PR #756
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 6216daedb32c607ac1405475b1d0f4c22559198e
Merge: 1960b37 6afdb7b
Author: krzys-h <krzys_h at interia.pl>
Date: Sun Apr 3 20:17:23 2016 +0200
Merge part of PR #756
src/common/restext.cpp | 4 +--
src/level/player_profile.cpp | 55 +++++++++++++++++++++++++++++---------
src/level/player_profile.h | 1 +
src/level/robotmain.cpp | 4 ++-
src/ui/object_interface.cpp | 55 +++++++++++++++++++++-----------------
src/ui/screen/screen_apperance.cpp | 5 ++--
6 files changed, 82 insertions(+), 42 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list