diff options
author | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
commit | 9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch) | |
tree | dad948f012cbc7d65e0dccde273667a389ff1c6d /imports/codemirror/mode/rpm | |
parent | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff) | |
parent | b4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff) | |
download | ninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'imports/codemirror/mode/rpm')
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/changes/changes.js | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/changes/index.html | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/spec/index.html | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/spec/spec.css | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/mode/rpm/spec/spec.js | 2 |
5 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/rpm/changes/changes.js b/imports/codemirror/mode/rpm/changes/changes.js index cb45f9e5..cb45f9e5 100755..100644 --- a/imports/codemirror/mode/rpm/changes/changes.js +++ b/imports/codemirror/mode/rpm/changes/changes.js | |||
diff --git a/imports/codemirror/mode/rpm/changes/index.html b/imports/codemirror/mode/rpm/changes/index.html index b7ff952d..b7ff952d 100755..100644 --- a/imports/codemirror/mode/rpm/changes/index.html +++ b/imports/codemirror/mode/rpm/changes/index.html | |||
diff --git a/imports/codemirror/mode/rpm/spec/index.html b/imports/codemirror/mode/rpm/spec/index.html index e3bca152..e3bca152 100755..100644 --- a/imports/codemirror/mode/rpm/spec/index.html +++ b/imports/codemirror/mode/rpm/spec/index.html | |||
diff --git a/imports/codemirror/mode/rpm/spec/spec.css b/imports/codemirror/mode/rpm/spec/spec.css index d0a5d430..d0a5d430 100755..100644 --- a/imports/codemirror/mode/rpm/spec/spec.css +++ b/imports/codemirror/mode/rpm/spec/spec.css | |||
diff --git a/imports/codemirror/mode/rpm/spec/spec.js b/imports/codemirror/mode/rpm/spec/spec.js index 3b5c08c9..902db6ae 100755..100644 --- a/imports/codemirror/mode/rpm/spec/spec.js +++ b/imports/codemirror/mode/rpm/spec/spec.js | |||
@@ -14,7 +14,7 @@ CodeMirror.defineMode("spec", function(config, modeConfig) { | |||
14 | return { | 14 | return { |
15 | controlFlow: false, | 15 | controlFlow: false, |
16 | macroParameters: false, | 16 | macroParameters: false, |
17 | section: false, | 17 | section: false |
18 | }; | 18 | }; |
19 | }, | 19 | }, |
20 | token: function (stream, state) { | 20 | token: function (stream, state) { |