aboutsummaryrefslogtreecommitdiff
path: root/js/data/menu-data.js
diff options
context:
space:
mode:
authorEric Guzman2012-03-17 00:05:14 -0700
committerEric Guzman2012-03-17 00:05:14 -0700
commita3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch)
tree497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/data/menu-data.js
parenta6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts: js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/data/menu-data.js')
-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 },