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/colorwheel.reel | |
| 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/colorwheel.reel')
| -rwxr-xr-x[-rw-r--r--] | js/components/colorwheel.reel/colorwheel.html | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/colorwheel.reel/colorwheel.js | 0 | ||||
| -rw-r--r-- | js/components/colorwheel.reel/compass_app_log.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/colorwheel.reel/css/colorwheel.css | 0 |
4 files changed, 0 insertions, 3 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 0374e6a3..0374e6a3 100644..100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
diff --git a/js/components/colorwheel.reel/colorwheel.js b/js/components/colorwheel.reel/colorwheel.js index 343422e2..343422e2 100644..100755 --- a/js/components/colorwheel.reel/colorwheel.js +++ b/js/components/colorwheel.reel/colorwheel.js | |||
diff --git a/js/components/colorwheel.reel/compass_app_log.txt b/js/components/colorwheel.reel/compass_app_log.txt deleted file mode 100644 index 815feb02..00000000 --- a/js/components/colorwheel.reel/compass_app_log.txt +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 2011-11-23 01:07:12 create css/colorwheel.css | ||
| 2 | 2011-11-23 01:07:25 overwrite css/colorwheel.css | ||
| 3 | 2011-12-20 17:04:05 overwrite css/colorwheel.css | ||
diff --git a/js/components/colorwheel.reel/css/colorwheel.css b/js/components/colorwheel.reel/css/colorwheel.css index 3917bd52..3917bd52 100644..100755 --- a/js/components/colorwheel.reel/css/colorwheel.css +++ b/js/components/colorwheel.reel/css/colorwheel.css | |||