This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 0ecdee08ccd3f520c7e27471b4867cd324e6bb33
Merge: 4cb2eb6 29f0631
Author: krzys-h <krzy...@interia.pl>
Date: Tue Aug 9 19:20:46 2016 +0200
Merge branch 'dev-async-music-load' (PR #801)
src/CMakeLists.txt | 2 +
src/app/app.cpp | 18 ++++-
src/common/thread/resource_owning_thread.h | 15 +++-
src/common/thread/sdl_cond_wrapper.h | 12 +++
src/common/thread/sdl_mutex_wrapper.h | 10 +++
src/common/thread/thread.h | 77 ++++++++++++++++++++
src/common/thread/worker_thread.h | 92 +++++++++++++++++++++++
src/sound/oalsound/alsound.cpp | 113 ++++++++++++-----------------
src/sound/oalsound/alsound.h | 11 +--
src/sound/sound.cpp | 28 +------
src/sound/sound.h | 26 ++-----
src/ui/mainui.cpp | 3 +-
12 files changed, 289 insertions(+), 118 deletions(-)
diff --cc src/app/app.cpp
index 3db0aae,6241ef0..4ab6440
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@@ -34,8 -34,8 +34,10 @@@
#include "common/resources/resourcemanager.h"
+#include "common/system/system.h"
+
+ #include "common/thread/thread.h"
+
#include "graphics/core/nulldevice.h"
#include "graphics/opengl/glutil.h"
--
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
