diff options
| author | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
| commit | b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d (patch) | |
| tree | ec1e9d373636569e09cdf669f063d4d2a1e441f4 /js/ninja.reel | |
| parent | 792793cd3991032b4840ade67f98ae8eae2d30a0 (diff) | |
| parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
| download | ninja-b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/ninja.reel')
| -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"}, |