diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /images/tools | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@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 | |||
