aboutsummaryrefslogtreecommitdiff
path: root/images/optionsbar/zoom
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /images/optionsbar/zoom
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'images/optionsbar/zoom')
-rwxr-xr-x[-rw-r--r--]images/optionsbar/zoom/zoom_minus.pngbin3117 -> 3117 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/zoom/zoom_plus.pngbin3128 -> 3128 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/zoom/zoom_minus.png b/images/optionsbar/zoom/zoom_minus.png
index e337dd68..e337dd68 100644..100755
--- a/images/optionsbar/zoom/zoom_minus.png
+++ b/images/optionsbar/zoom/zoom_minus.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_plus.png b/images/optionsbar/zoom/zoom_plus.png
index c92d839d..c92d839d 100644..100755
--- a/images/optionsbar/zoom/zoom_plus.png
+++ b/images/optionsbar/zoom/zoom_plus.png
Binary files differ