diff options
| author | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 20:37:48 -0800 |
| commit | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch) | |
| tree | 4d29118f35df77ca6b423119a4ff61694a442cbf /images/SpriteSheets | |
| parent | 9d2c2a80483415d7560b00cda5519153db23e241 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
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 | |||
