diff options
| author | Ananya Sen | 2012-03-06 17:15:46 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-03-06 17:15:46 -0800 |
| commit | 5afc582a1ae537f1e30113394780f1c8eec58f89 (patch) | |
| tree | eb1583408136c207631175405e410148da529652 /js/ninja.reel | |
| parent | 96e4a494d559da6b4041c1c14c26b53221276e4b (diff) | |
| parent | cef07085443b7c31e878daaad083b7408c57e104 (diff) | |
| download | ninja-5afc582a1ae537f1e30113394780f1c8eec58f89.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya
Conflicts:
js/controllers/selection-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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"}, |