aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 16:18:10 -0800
committerValerio Virgillito2012-03-06 16:18:10 -0800
commit2e3943a8f751ec572066f168b58464c24b9f29e5 (patch)
tree3975b1aa412e5b8c377accfe15536622544d6826 /js/ninja.reel/ninja.html
parentc2805e03c84b6e598556fd06d1ede7aaeea7ce9c (diff)
parent4f498b43264327f5886e0370bd3536453d47570a (diff)
downloadninja-2e3943a8f751ec572066f168b58464c24b9f29e5.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index cdf53ddf..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -166,7 +166,7 @@
166 }, 166 },
167 167
168 "panelContainer": { 168 "panelContainer": {
169 "module": "js/panels/PanelContainer/PanelContainer.reel", 169 "module": "js/panels/PanelContainer.reel",
170 "name": "PanelContainer", 170 "name": "PanelContainer",
171 "properties": { 171 "properties": {
172 "element": {"#": "rightPanelContent"}, 172 "element": {"#": "rightPanelContent"},