Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

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){
                 hex                             :1,     // - convert a string to a hexadecimal number
                 'import'                        :1,     // - patch a module's namespace into your own
                 index                           :1,     // - find a substring within a string
-                int                             :1,     // - get the integer portion of a number
+                'int'                           :1,     // - get the integer portion of a number
                 ioctl                           :1,     // - system-dependent device control system call
                 'join'                          :1,     // - join a list into a string using a separator
                 keys                            :1,     // - retrieve list of indices from a hash