diff options
| author | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
| commit | f7f445e8ced728d04de4bf1c5711f6756488a71e (patch) | |
| tree | b09f00c28ff7123354af40509283ddec846f438d /scss/ninja.scss | |
| parent | 632a5daca17acb774b9344ccc0e9107f1643924c (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
Diffstat (limited to 'scss/ninja.scss')
| -rwxr-xr-x | scss/ninja.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scss/ninja.scss b/scss/ninja.scss index 1061780a..002ab8e8 100755 --- a/scss/ninja.scss +++ b/scss/ninja.scss | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | body { | 35 | body { |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | |||
| 38 | // Codemirror | 39 | // Codemirror |
| 39 | //@import "imports/codemirror/_codemirror"; | 40 | //@import "imports/codemirror/_codemirror"; |
| 40 | //@import "imports/codemirror/_javascript"; | 41 | //@import "imports/codemirror/_javascript"; |