]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
stop
authorClyne Sullivan <tullivan99@gmail.com>
Mon, 23 May 2016 12:49:47 +0000 (08:49 -0400)
committerClyne Sullivan <tullivan99@gmail.com>
Mon, 23 May 2016 12:49:47 +0000 (08:49 -0400)
1  2 
brice.dat
main.cpp

diff --cc brice.dat
index 051568e6307a034d42f5b52f7113ce37e815df20,61d57c2785952fa6cb22f35f6db947ff5ddf91d2..bda8adcb6642decd7a089554d88b1583f814346b
+++ b/brice.dat
@@@ -1,9 -1,5 +1,5 @@@
- 4
  2
 -canJump
 -0
  canSprint
- canSprint
 -0
 +1
- 0
- canJump
 +canJump
 +1
diff --cc main.cpp
Simple merge