diff options
| author | Jonathan Duran | 2012-02-06 13:30:49 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-06 13:30:49 -0800 |
| commit | a39bad832722a10f6556f91e94c3301a41f59bd5 (patch) | |
| tree | e436e919f9f67c56e8bce462aab95ff3804813cc /js/ninja.reel/ninja.html | |
| parent | 671a27069db6a121507c2b342653aede685cff67 (diff) | |
| download | ninja-a39bad832722a10f6556f91e94c3301a41f59bd5.tar.gz | |
merge new timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rw-r--r-- | js/ninja.reel/ninja.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706c8243..1aaa0c60 100644 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -279,7 +279,8 @@ | |||
| 279 | "stylesController": {"@": "stylesController"}, | 279 | "stylesController": {"@": "stylesController"}, |
| 280 | "filePickerController": {"@": "filePickerController"}, | 280 | "filePickerController": {"@": "filePickerController"}, |
| 281 | "newFileController": {"@": "newFileController"}, | 281 | "newFileController": {"@": "newFileController"}, |
| 282 | "documentBar": {"@": "documentBar"} | 282 | "documentBar": {"@": "documentBar"}, |
| 283 | "timeline": {"@": "timeline"} | ||
| 283 | } | 284 | } |
| 284 | } | 285 | } |
| 285 | 286 | ||