diff options
| author | Jon Reid | 2012-03-06 18:08:37 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-06 18:08:37 -0800 |
| commit | 6056fdb63b5f4690115e63ee50e8d7dac309ba64 (patch) | |
| tree | 5fbe386e4c7732fb84b98c9539b186898f076c7b /js/ninja.reel | |
| parent | bcfb704b04587f95a13c474cf0598ba90ec3b371 (diff) | |
| parent | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (diff) | |
| download | ninja-6056fdb63b5f4690115e63ee50e8d7dac309ba64.tar.gz | |
Merge branch 'Timeline-uber' into timeline-serialized
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"}, |