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/ninja.reel/ninja.css | |
| 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/ninja.reel/ninja.css')
| -rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.css | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 99fa9a4f..83c0e569 100644..100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
| @@ -7,5 +7,3 @@ | |||
| 7 | .main { | 7 | .main { |
| 8 | padding: 100px; | 8 | padding: 100px; |
| 9 | } | 9 | } |
| 10 | |||
| 11 | |||