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

Conflicts:
	src/Main/Game.cpp
This commit is contained in:
Tamir Atias 2012-04-19 17:32:49 +03:00
commit 73c85f0be7
3 changed files with 4 additions and 4 deletions

View File

@ -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 \

2
README
View File

@ -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