diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/ninja.reel/ninja.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706b77d4..05b37bba 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | 2 | ||
| 3 | <!-- <copyright> | 3 | <!-- <copyright> |
| 4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility, Inc |
| @@ -338,7 +338,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 338 | "element": {"#": "popupWindows"} | 338 | "element": {"#": "popupWindows"} |
| 339 | } | 339 | } |
| 340 | }, | 340 | }, |
| 341 | 341 | ||
| 342 | "colorController1": { | 342 | "colorController1": { |
| 343 | "prototype": "js/controllers/color-controller" | 343 | "prototype": "js/controllers/color-controller" |
| 344 | }, | 344 | }, |
| @@ -354,7 +354,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 354 | "newFileController": { | 354 | "newFileController": { |
| 355 | "prototype": "js/io/ui/new-file-dialog/new-file-workflow-controller" | 355 | "prototype": "js/io/ui/new-file-dialog/new-file-workflow-controller" |
| 356 | }, | 356 | }, |
| 357 | 357 | ||
| 358 | "coreIoApi1": { | 358 | "coreIoApi1": { |
| 359 | "prototype": "js/io/system/coreioapi[CoreIoApi]" | 359 | "prototype": "js/io/system/coreioapi[CoreIoApi]" |
| 360 | }, | 360 | }, |
| @@ -406,7 +406,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 406 | "selectionController": {"@": "selectionController"}, | 406 | "selectionController": {"@": "selectionController"}, |
| 407 | "documentController": {"@": "documentController"}, | 407 | "documentController": {"@": "documentController"}, |
| 408 | "popupManager": {"@": "popupManager1"}, | 408 | "popupManager": {"@": "popupManager1"}, |
| 409 | "colorController": {"@": "colorController1"}, | 409 | "colorController": {"@": "colorController1"}, |
| 410 | "stylesController": {"@": "stylesController"}, | 410 | "stylesController": {"@": "stylesController"}, |
| 411 | "presetsController": {"@": "presetsController"}, | 411 | "presetsController": {"@": "presetsController"}, |
| 412 | "filePickerController": {"@": "filePickerController"}, | 412 | "filePickerController": {"@": "filePickerController"}, |
| @@ -424,7 +424,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 424 | "timelineSplitter": {"@": "splitter4"}, | 424 | "timelineSplitter": {"@": "splitter4"}, |
| 425 | "toolsSplitter": {"@": "splitter2"}, | 425 | "toolsSplitter": {"@": "splitter2"}, |
| 426 | "optionsSplitter": {"@": "splitter1"}, | 426 | "optionsSplitter": {"@": "splitter1"}, |
| 427 | "clipboardController": {"@": "clipboardController"}, | 427 | "clipboardController": {"@": "clipboardController"}, |
| 428 | "documentList": {"@": "documentList"} | 428 | "documentList": {"@": "documentList"} |
| 429 | } | 429 | } |
| 430 | } | 430 | } |