diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/lib/util/formatting.js | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'imports/codemirror/lib/util/formatting.js')
| -rw-r--r-- | imports/codemirror/lib/util/formatting.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/lib/util/formatting.js b/imports/codemirror/lib/util/formatting.js index 15de0355..e1891191 100644 --- a/imports/codemirror/lib/util/formatting.js +++ b/imports/codemirror/lib/util/formatting.js | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // ============== Formatting extensions ============================ | 1 | // ============== Formatting extensions ============================ |
| 2 | // A common storage for all mode-specific formatting features | 2 | // A common storage for all mode-specific formatting features |
| 3 | if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {}; | 3 | if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {}; |
| 4 | 4 | ||