Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] I knew Git would leave the conflict headers in there like a bitch!

Browse Source
This commit is contained in:
Rtch90 2012-01-06 00:56:37 +00:00
parent 9173235610
commit 2874786ae6
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libUnuk/Makefile
View File

@ -5,10 +5,7 @@ objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \ Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \ Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
Rect.o Text.o Texture.o TextureManager.o Timer.o \ Rect.o Text.o Texture.o TextureManager.o Timer.o \
<<<<<<< HEAD
=======
AStar.o \ AStar.o \
>>>>>>> playground
.PHONY: default all clean .PHONY: default all clean