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 /js/components/tools-properties | |
| 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 'js/components/tools-properties')
56 files changed, 554 insertions, 144 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.css +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css | |||
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index 38f7f856..38f7f856 100644..100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 92da98cc..92da98cc 100644..100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js | |||
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.css b/js/components/tools-properties/eraser-properties.reel/eraser-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.css +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.css | |||
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html index f6a58a10..f6a58a10 100644..100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html | |||
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js index ed461d3a..ed461d3a 100644..100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js | |||
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.css | |||
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 3718c5c5..3718c5c5 100644..100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html | |||
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js index e1a1f8b5..e1a1f8b5 100644..100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js | |||
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css | |||
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index a35f9b15..a35f9b15 100644..100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index 61b667d7..61b667d7 100644..100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | |||
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 1602e793..1602e793 100644..100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index e3ffc359..e3ffc359 100644..100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js | |||
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.css b/js/components/tools-properties/line-properties.reel/line-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.css +++ b/js/components/tools-properties/line-properties.reel/line-properties.css | |||
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html index 1ec14cca..1ec14cca 100644..100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.html +++ b/js/components/tools-properties/line-properties.reel/line-properties.html | |||
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js index e1ecf790..e1ecf790 100644..100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.js +++ b/js/components/tools-properties/line-properties.reel/line-properties.js | |||
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 3f882850..3f882850 100644..100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js index afcb2400..afcb2400 100644..100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js | |||
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.css +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css | |||
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index 942ba9b0..942ba9b0 100644..100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html | |||
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index ddeb64ee..ddeb64ee 100644..100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js | |||
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.css b/js/components/tools-properties/pan-properties.reel/pan-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/pan-properties.reel/pan-properties.css +++ b/js/components/tools-properties/pan-properties.reel/pan-properties.css | |||
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html index d8c3281a..d8c3281a 100644..100755 --- a/js/components/tools-properties/pan-properties.reel/pan-properties.html +++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html | |||
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.js b/js/components/tools-properties/pan-properties.reel/pan-properties.js index 801aaa6b..801aaa6b 100644..100755 --- a/js/components/tools-properties/pan-properties.reel/pan-properties.js +++ b/js/components/tools-properties/pan-properties.reel/pan-properties.js | |||
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.css +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css | |||
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index 74a3a747..74a3a747 100644..100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index b57f9a6f..b57f9a6f 100644..100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.css b/js/components/tools-properties/pencil-properties.reel/pencil-properties.css index 7f1b0f7f..7f1b0f7f 100644..100755 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.css +++ b/js/components/tools-properties/pencil-properties.reel/pencil-properties.css | |||
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html index 964cdd0e..964cdd0e 100644..100755 --- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html +++ b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html | |||