diff options
| author | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
| commit | 0bd1cefea2ab350fad1a891bdc926053b799aafc (patch) | |
| tree | 962f559fcc02a3dfeb297d59907e40fa153453f3 /images/SpriteSheets | |
| parent | 695bc5082f48dddf66ce31480a4faefc067b38bd (diff) | |
| parent | 2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff) | |
| download | ninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz | |
Merge branch 'refs/heads/master' into new-tool-icons
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 | |||
