Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/ninja.reel/ninja.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
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 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
@@ -338,7 +338,7 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "popupWindows"}
                }
            },
-            
            "colorController1": {
                "prototype": "js/controllers/color-controller"
            },
@@ -354,7 +354,7 @@ POSSIBILITY OF SUCH DAMAGE.
            "newFileController": {
                "prototype": "js/io/ui/new-file-dialog/new-file-workflow-controller"
            },
-            
            "coreIoApi1": {
                "prototype": "js/io/system/coreioapi[CoreIoApi]"
            },
@@ -406,7 +406,7 @@ POSSIBILITY OF SUCH DAMAGE.
                    "selectionController":  {"@": "selectionController"},
                    "documentController":   {"@": "documentController"},
                    "popupManager":         {"@": "popupManager1"},
-                                        "colorController":      {"@": "colorController1"},
+                    "colorController":      {"@": "colorController1"},
                    "stylesController":     {"@": "stylesController"},
                    "presetsController":    {"@": "presetsController"},
                    "filePickerController": {"@": "filePickerController"},
@@ -424,7 +424,7 @@ POSSIBILITY OF SUCH DAMAGE.
                    "timelineSplitter":     {"@": "splitter4"},
                    "toolsSplitter":        {"@": "splitter2"},
                    "optionsSplitter":      {"@": "splitter1"},
-                                        "clipboardController":  {"@": "clipboardController"},
+                    "clipboardController":  {"@": "clipboardController"},
                    "documentList":         {"@": "documentList"}
                }
            }
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/ninja.reel/ninja.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

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	}