aboutsummaryrefslogtreecommitdiff
path: root/images/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 16:06:56 -0700
committerValerio Virgillito2012-05-16 16:06:56 -0700
commit92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch)
treee385beee8f2694596f6305bf90eb7eb4521de2e2 /images/tools
parentbdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'images/tools')
-rw-r--r--images/tools/Tool-FillColor.pngbin1111 -> 1400 bytes
-rw-r--r--[-rwxr-xr-x]images/tools/inkbottle_cursor.png (renamed from images/tools/inkbottle_down.png)bin3352 -> 3352 bytes
-rwxr-xr-ximages/tools/pencil_down.pngbin3103 -> 0 bytes
-rwxr-xr-ximages/tools/pencil_up.pngbin3101 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-3d.pngbin2599 -> 0 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-tag.pngbin6403 -> 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