diff options
author | jlew <jlew.blackout@gmail.com> | 2010-08-05 02:27:54 (GMT) |
---|---|---|
committer | jlew <jlew.blackout@gmail.com> | 2010-08-05 02:34:17 (GMT) |
commit | a40c23156be43a23df3f93eb0355cd4f21763233 (patch) | |
tree | 5a852419761143ceeada401867825c534eeb31d7 /devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt | |
parent | 4e706cac2b99b7eb4b98bd55d5a28da728d4cf39 (diff) | |
parent | 50df09bbfa69fe00b16ea8ec9ceabadba5ce7d08 (diff) |
Merge branch 'animationrework'
Conflicts:
MAFH2/BattleEngine.py
Diffstat (limited to 'devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt')
-rwxr-xr-x | devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt b/devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt new file mode 100755 index 0000000..dc66dbe --- /dev/null +++ b/devtools/CompleteTestKit/to-do/Animation Styles/OneSheetPerAnimation/gif/text.txt @@ -0,0 +1,2 @@ +anim1,0,8
+anim2,9,17
\ No newline at end of file |