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>

5 files changed, 5 insertions, 5 deletions

diff --git a/node_modules/montage/data/control-listener.js b/node_modules/montage/data/control-listener.js
index 1571f8b7..9e723ccf 100755
--- a/node_modules/montage/data/control-listener.js
+++ b/node_modules/montage/data/control-listener.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/data/control-listener
+    @module montage/data/control-listener
     @requires montage/core/core
     @requires montage/core/logger
 */
diff --git a/node_modules/montage/data/ldap-access/ldap-object-id.js b/node_modules/montage/data/ldap-access/ldap-object-id.js
index 49790933..be3c308f 100755
--- a/node_modules/montage/data/ldap-access/ldap-object-id.js
+++ b/node_modules/montage/data/ldap-access/ldap-object-id.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/data/ldap-access/ldap-object-id
+    @module montage/data/ldap-access/ldap-object-id
     @requires montage/core/core
     @requires montage/core/logger
 */
diff --git a/node_modules/montage/data/nosql-access/nosql-object-id.js b/node_modules/montage/data/nosql-access/nosql-object-id.js
index eae279a0..9ca9cbde 100755
--- a/node_modules/montage/data/nosql-access/nosql-object-id.js
+++ b/node_modules/montage/data/nosql-access/nosql-object-id.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/data/nosql-access/nosql-object-id
+    @module montage/data/nosql-access/nosql-object-id
     @requires montage/core/core
     @requires montage/data/-object-id
     @requires montage/core/logger
diff --git a/node_modules/montage/data/rest-access/rest-object-id.js b/node_modules/montage/data/rest-access/rest-object-id.js
index 791965cd..45ebfb21 100755
--- a/node_modules/montage/data/rest-access/rest-object-id.js
+++ b/node_modules/montage/data/rest-access/rest-object-id.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/data/rest-object-id
+    @module montage/data/rest-object-id
     @requires montage/data/object-id
     @requires montage/core/logger
 */
diff --git a/node_modules/montage/data/sql-access/sql-object-id.js b/node_modules/montage/data/sql-access/sql-object-id.js
index 75e6a625..50a763f0 100755
--- a/node_modules/montage/data/sql-access/sql-object-id.js
+++ b/node_modules/montage/data/sql-access/sql-object-id.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/data/sql-access/sql-object-id
+    @module montage/data/sql-access/sql-object-id
     @requires montage/core/core
     @requires montage/data/object-id
     @requires montage/core/logger