diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /images/tools | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
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 | |||
