Merge branch 'master' of github.com:Allanis/LibD
Conflicts: src/Main/Game.cpp
This commit is contained in:
commit
73c85f0be7
@ -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
2
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
|
||||
|
Loading…
Reference in New Issue
Block a user