Merge branch 'master' of github.com:Allanis/LibD

Conflicts:
	src/Main/Game.cpp

LibDQt/LibDQt.pro

@@ -8,7 +8,7 @@ LIBS += -lGL \
     -ltinyxml \
     -lSDL_mixer \
     -lSDL_ttf
-win32: { 
+win32: {
     LIBS -= -lGL \
         -lGLU
     LIBS += -lkernel32 \
@@ -105,4 +105,4 @@ SOURCES += ../src/Actor/Player.cpp \
     ../src/Animation/AnimatingSprite.cpp \
     ../src/UI/Menu.cpp \
     ../src/UI/Button.cpp \
-    ../src/Main/TitleScreen.cpp
+    ../src/Main/TitleScreen.cpp \

README

@@ -14,7 +14,7 @@ KonoM
 ##################################################################
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (C) 2011 SaraCraft
+Copyright (C) 2012 SaraCraft
 allanis@saracraft.net
 
 This program is free software; you can redistribute it and/or

src/Main/Game.cpp

@@ -32,7 +32,7 @@ Game::Game(void) {
 
   _titleScreen = new TitleScreen();
   _inTitleScreen = true;
-  
+
   _inGameMenu = NULL;
   _inGameMenuShown = false;