diff options
author | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
commit | abf78e2d7a97d295ce5a1c425fd359d47379137e (patch) | |
tree | d08c91bd2aef31e6325e0b499b2ffc390018bec6 /images/SpriteSheets | |
parent | e80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'images/SpriteSheets')
-rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet.png | bin | 12780 -> 12780 bytes | |||
-rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2.png | bin | 19651 -> 19651 bytes | |||
-rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2.psd | bin | 199849 -> 199849 bytes | |||
-rwxr-xr-x[-rw-r--r--] | images/SpriteSheets/NinjaSpriteSheet2_5.png | bin | 17381 -> 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 | |||