[Fix] Merging crap to git.
This commit is contained in:
parent
3e20041111
commit
996c6418b1
@ -62,7 +62,7 @@ HEADERS += ../src/Actor/Player.h \
|
|||||||
../src/Animation/AnimationSequence.h \
|
../src/Animation/AnimationSequence.h \
|
||||||
../src/System/String.h \
|
../src/System/String.h \
|
||||||
../src/Font/Font.h \
|
../src/Font/Font.h \
|
||||||
../src/Animation/AnimatingSprite.h
|
../src/Animation/AnimatingSprite.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 \
|
||||||
@ -99,5 +99,5 @@ SOURCES += ../src/Actor/Player.cpp \
|
|||||||
../src/Animation/AnimationSequence.cpp \
|
../src/Animation/AnimationSequence.cpp \
|
||||||
../src/System/String.cpp \
|
../src/System/String.cpp \
|
||||||
../src/Font/Font.cpp \
|
../src/Font/Font.cpp \
|
||||||
../src/Animation/AnimatingSprite.cpp
|
../src/Animation/AnimatingSprite.cpp \
|
||||||
OTHER_FILES +=
|
OTHER_FILES +=
|
||||||
|
Loading…
Reference in New Issue
Block a user