aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/perl
diff options
context:
space:
mode:
authorEric Guzman2012-03-12 15:33:04 -0700
committerEric Guzman2012-03-12 15:33:04 -0700
commit7e3161153b87b891875ac65368a19aed12909fa3 (patch)
treeb80f48d711a9729fc39dbbdff28c4f0620e7302d /imports/codemirror/mode/perl
parent7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'imports/codemirror/mode/perl')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/LICENSE0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/perl/perl.js2
3 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/perl/LICENSE b/imports/codemirror/mode/perl/LICENSE
index 96f4115a..96f4115a 100755..100644
--- a/imports/codemirror/mode/perl/LICENSE
+++ b/imports/codemirror/mode/perl/LICENSE
diff --git a/imports/codemirror/mode/perl/index.html b/imports/codemirror/mode/perl/index.html
index 5ef55d32..5ef55d32 100755..100644
--- a/imports/codemirror/mode/perl/index.html
+++ b/imports/codemirror/mode/perl/index.html
diff --git a/imports/codemirror/mode/perl/perl.js b/imports/codemirror/mode/perl/perl.js
index e2e1cbef..7fa129ea 100755..100644
--- a/imports/codemirror/mode/perl/perl.js
+++ b/imports/codemirror/mode/perl/perl.js
@@ -324,7 +324,7 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
324 hex :1, // - convert a string to a hexadecimal number 324 hex :1, // - convert a string to a hexadecimal number
325 'import' :1, // - patch a module's namespace into your own 325 'import' :1, // - patch a module's namespace into your own
326 index :1, // - find a substring within a string 326 index :1, // - find a substring within a string
327 int :1, // - get the integer portion of a number 327 'int' :1, // - get the integer portion of a number
328 ioctl :1, // - system-dependent device control system call 328 ioctl :1, // - system-dependent device control system call
329 'join' :1, // - join a list into a string using a separator 329 'join' :1, // - join a list into a string using a separator
330 keys :1, // - retrieve list of indices from a hash 330 keys :1, // - retrieve list of indices from a hash