diff options
| author | Jose Antonio Marquez | 2012-03-06 16:19:59 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-06 16:19:59 -0800 |
| commit | f6a60f50ca9cd09713baa27f2990eda9346496fc (patch) | |
| tree | 3975b1aa412e5b8c377accfe15536622544d6826 /js/ninja.reel/ninja.html | |
| parent | 7271c25bf34917b1751f433d284f21485057425b (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-f6a60f50ca9cd09713baa27f2990eda9346496fc.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Conflicts:
js/controllers/selection-controller.js
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 2 |
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"}, |