diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /images/tools | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@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 | |||
