diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /images/cursors | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'images/cursors')
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Crosshair.png | bin | 345 -> 345 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_X.png | bin | 2897 -> 2897 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_Y.png | bin | 2890 -> 2890 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/Translate_Z.png | bin | 2894 -> 2894 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/fill.png | bin | 3583 -> 3583 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/ink.png | bin | 3352 -> 3352 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/ink_no.png | bin | 1688 -> 1688 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/nofill.png | bin | 3672 -> 3672 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/zoom.png | bin | 418 -> 418 bytes |
| -rwxr-xr-x[-rw-r--r--] | images/cursors/zoom_minus.png | bin | 423 -> 423 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/images/cursors/Crosshair.png b/images/cursors/Crosshair.png index 4d98de34..4d98de34 100644..100755 --- a/images/cursors/Crosshair.png +++ b/images/cursors/Crosshair.png | |||
| Binary files differ | |||
diff --git a/images/cursors/Translate_X.png b/images/cursors/Translate_X.png index 38f0c8fa..38f0c8fa 100644..100755 --- a/images/cursors/Translate_X.png +++ b/images/cursors/Translate_X.png | |||
| Binary files differ | |||
diff --git a/images/cursors/Translate_Y.png b/images/cursors/Translate_Y.png index a49487a0..a49487a0 100644..100755 --- a/images/cursors/Translate_Y.png +++ b/images/cursors/Translate_Y.png | |||
| Binary files differ | |||
diff --git a/images/cursors/Translate_Z.png b/images/cursors/Translate_Z.png index a547b062..a547b062 100644..100755 --- a/images/cursors/Translate_Z.png +++ b/images/cursors/Translate_Z.png | |||
| Binary files differ | |||
diff --git a/images/cursors/fill.png b/images/cursors/fill.png index 8fe7d1b5..8fe7d1b5 100644..100755 --- a/images/cursors/fill.png +++ b/images/cursors/fill.png | |||
| Binary files differ | |||
diff --git a/images/cursors/ink.png b/images/cursors/ink.png index f07d0d25..f07d0d25 100644..100755 --- a/images/cursors/ink.png +++ b/images/cursors/ink.png | |||
| Binary files differ | |||
diff --git a/images/cursors/ink_no.png b/images/cursors/ink_no.png index 083e207e..083e207e 100644..100755 --- a/images/cursors/ink_no.png +++ b/images/cursors/ink_no.png | |||
| Binary files differ | |||
diff --git a/images/cursors/nofill.png b/images/cursors/nofill.png index b271ca49..b271ca49 100644..100755 --- a/images/cursors/nofill.png +++ b/images/cursors/nofill.png | |||
| Binary files differ | |||
diff --git a/images/cursors/zoom.png b/images/cursors/zoom.png index 064be197..064be197 100644..100755 --- a/images/cursors/zoom.png +++ b/images/cursors/zoom.png | |||
| Binary files differ | |||
diff --git a/images/cursors/zoom_minus.png b/images/cursors/zoom_minus.png index f18a7e5c..f18a7e5c 100644..100755 --- a/images/cursors/zoom_minus.png +++ b/images/cursors/zoom_minus.png | |||
| Binary files differ | |||
