Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2012-09-06 21:56:11 +02:00
12 changed files with 28 additions and 28 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ using namespace std;
SDLPlayer::SDLPlayer(ConfigFile *c)
#ifndef ANDROID
: soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c), sound(NULL)
: sound(NULL), soundData(NULL), currentChannel(0) , audioEnabled(0), myConfig(c)
#endif
{
#ifndef ANDROID