diff options
| author | hwc487 | 2012-05-17 11:06:20 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-17 11:06:20 -0700 |
| commit | 0a3c703ce285941da20167a6d04b13b7eced23be (patch) | |
| tree | e87019bcc3356c58dc93d982af2cfe16b582974b /images/tools | |
| parent | 1e649405d66f17d6acddb9055b181bba7ad70566 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'images/tools')
| -rw-r--r-- | images/tools/Tool-FillColor.png | bin | 1111 -> 1400 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/tools/inkbottle_cursor.png (renamed from images/tools/inkbottle_down.png) | bin | 3352 -> 3352 bytes |
| -rwxr-xr-x | images/tools/pencil_down.png | bin | 3103 -> 0 bytes |
| -rwxr-xr-x | images/tools/pencil_up.png | bin | 3101 -> 0 bytes |
| -rwxr-xr-x | images/tools/sprite-toolbar-3d.png | bin | 2599 -> 0 bytes |
| -rwxr-xr-x | images/tools/sprite-toolbar-tag.png | bin | 6403 -> 0 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/images/tools/Tool-FillColor.png b/images/tools/Tool-FillColor.png index f0580ef9..87c2ce7c 100644 --- a/images/tools/Tool-FillColor.png +++ b/images/tools/Tool-FillColor.png | |||
| Binary files differ | |||
diff --git a/images/tools/inkbottle_down.png b/images/tools/inkbottle_cursor.png index f07d0d25..f07d0d25 100755..100644 --- a/images/tools/inkbottle_down.png +++ b/images/tools/inkbottle_cursor.png | |||
| Binary files differ | |||
diff --git a/images/tools/pencil_down.png b/images/tools/pencil_down.png deleted file mode 100755 index 55b22eb2..00000000 --- a/images/tools/pencil_down.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/images/tools/pencil_up.png b/images/tools/pencil_up.png deleted file mode 100755 index f7b44c7c..00000000 --- a/images/tools/pencil_up.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/images/tools/sprite-toolbar-3d.png b/images/tools/sprite-toolbar-3d.png deleted file mode 100755 index d4746064..00000000 --- a/images/tools/sprite-toolbar-3d.png +++ /dev/null | |||
| Binary files differ | |||
diff --git a/images/tools/sprite-toolbar-tag.png b/images/tools/sprite-toolbar-tag.png deleted file mode 100755 index 69b13ec3..00000000 --- a/images/tools/sprite-toolbar-tag.png +++ /dev/null | |||
| Binary files differ | |||
