aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 13:12:43 -0700
committerEric Guzman2012-03-13 13:12:43 -0700
commit61fd46cad105f0a52afa028e5301b96120f00ab4 (patch)
treed8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/data
parent7e3161153b87b891875ac65368a19aed12909fa3 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 52710b3a..40512f5d 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -31,6 +31,12 @@ exports.MenuData = Montage.create( Montage, {
31 "action": "executeFileOpen" 31 "action": "executeFileOpen"
32 }, 32 },
33 { 33 {
34 "displayText" : "Close File",
35 "hasSubMenu" : false,
36 "enabled": true,
37 "action": "executeFileClose"
38 },
39 {
34 "displayText" : "", 40 "displayText" : "",
35 "separator": true 41 "separator": true
36 }, 42 },