aboutsummaryrefslogtreecommitdiff
path: root/images/SpriteSheets
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /images/SpriteSheets
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'images/SpriteSheets')
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet.pngbin12780 -> 12780 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet.txt0
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2.pngbin19651 -> 19651 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2.psdbin199849 -> 199849 bytes
-rwxr-xr-x[-rw-r--r--]images/SpriteSheets/NinjaSpriteSheet2_5.pngbin17381 -> 17381 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/images/SpriteSheets/NinjaSpriteSheet.png b/images/SpriteSheets/NinjaSpriteSheet.png
index 0359ee5d..0359ee5d 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet.png
+++ b/images/SpriteSheets/NinjaSpriteSheet.png
Binary files differ
diff --git a/images/SpriteSheets/NinjaSpriteSheet.txt b/images/SpriteSheets/NinjaSpriteSheet.txt
index 220a3bd3..220a3bd3 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet.txt
+++ b/images/SpriteSheets/NinjaSpriteSheet.txt
diff --git a/images/SpriteSheets/NinjaSpriteSheet2.png b/images/SpriteSheets/NinjaSpriteSheet2.png
index dd5f9609..dd5f9609 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet2.png
+++ b/images/SpriteSheets/NinjaSpriteSheet2.png
Binary files differ
diff --git a/images/SpriteSheets/NinjaSpriteSheet2.psd b/images/SpriteSheets/NinjaSpriteSheet2.psd
index a3984aa3..a3984aa3 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet2.psd
+++ b/images/SpriteSheets/NinjaSpriteSheet2.psd
Binary files differ
diff --git a/images/SpriteSheets/NinjaSpriteSheet2_5.png b/images/SpriteSheets/NinjaSpriteSheet2_5.png
index 6e0ce06c..6e0ce06c 100644..100755
--- a/images/SpriteSheets/NinjaSpriteSheet2_5.png
+++ b/images/SpriteSheets/NinjaSpriteSheet2_5.png
Binary files differ