aboutsummaryrefslogtreecommitdiff
path: root/images/temp
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/temp
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/temp')
-rwxr-xr-x[-rw-r--r--]images/temp/ruler-left.pngbin1638 -> 1638 bytes
-rwxr-xr-x[-rw-r--r--]images/temp/ruler-top.pngbin1685 -> 1685 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/images/temp/ruler-left.png b/images/temp/ruler-left.png
index 36f33977..36f33977 100644..100755
--- a/images/temp/ruler-left.png
+++ b/images/temp/ruler-left.png
Binary files differ
diff --git a/images/temp/ruler-top.png b/images/temp/ruler-top.png
index 3d12c727..3d12c727 100644..100755
--- a/images/temp/ruler-top.png
+++ b/images/temp/ruler-top.png
Binary files differ