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

This commit is contained in:
Tamir Atias 2012-04-12 20:05:40 +03:00
commit f06b6b15ca

View File

@ -53,7 +53,8 @@ HEADERS += ../src/Actor/Player.h \
../src/TMXParser/Tmx.h \ ../src/TMXParser/Tmx.h \
../src/TMXParser/base64.h \ ../src/TMXParser/base64.h \
../src/Collision/TileCollision.h \ ../src/Collision/TileCollision.h \
../src/Actor/NPC.h ../src/Actor/NPC.h \
../src/Sound/SoundEffect.h
SOURCES += ../src/Actor/Player.cpp \ SOURCES += ../src/Actor/Player.cpp \
../src/Collision/AABB.cpp \ ../src/Collision/AABB.cpp \
../src/Global/Globals.cpp \ ../src/Global/Globals.cpp \
@ -83,5 +84,6 @@ SOURCES += ../src/Actor/Player.cpp \
../src/TMXParser/TmxLayer.cpp \ ../src/TMXParser/TmxLayer.cpp \
../src/TMXParser/TmxImage.cpp \ ../src/TMXParser/TmxImage.cpp \
../src/TMXParser/base64.cpp \ ../src/TMXParser/base64.cpp \
../src/Actor/NPC.cpp ../src/Actor/NPC.cpp \
../src/Sound/SoundEffect.cpp
OTHER_FILES += OTHER_FILES +=