diff options
author | Eric Guzman | 2012-02-29 16:13:19 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-29 16:13:19 -0800 |
commit | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch) | |
tree | 44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/data/menu-data.js | |
parent | b2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff) | |
parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
download | ninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/data/menu-data.js')
-rwxr-xr-x | js/data/menu-data.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 7c3ca5d4..52710b3a 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
@@ -44,7 +44,7 @@ exports.MenuData = Montage.create( Montage, { | |||
44 | "displayText" : "Save As", | 44 | "displayText" : "Save As", |
45 | "hasSubMenu" : false, | 45 | "hasSubMenu" : false, |
46 | "enabled": true, | 46 | "enabled": true, |
47 | "action":"saveAs" | 47 | "action":"executeSaveAs" |
48 | }, | 48 | }, |
49 | { | 49 | { |
50 | "displayText" : "Save All", | 50 | "displayText" : "Save All", |