merging various commits and stashes

2013-05-01 21:30:02 +10:00
parent fe04561b26
commit 80004ca8d4
7 changed files with 66 additions and 3 deletions
@@ -11,7 +11,7 @@ OUTDIR=out
 OUT=$(addprefix $(OUTDIR)/,a)

 #source
-SRC=test_systems.cpp in_game.cpp
+SRC=test_systems.cpp in_game.cpp player_manager.cpp

 #targets
 all: $(OBJ) $(OUT)