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>

7 files changed, 15 insertions, 15 deletions

diff --git a/node_modules/montage/core/converter/bytes-converter.js b/node_modules/montage/core/converter/bytes-converter.js
index 84511924..17a4390c 100755
--- a/node_modules/montage/core/converter/bytes-converter.js
+++ b/node_modules/montage/core/converter/bytes-converter.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/core/converter/bytes-converter
+    @module montage/core/converter/bytes-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
     @requires montage/core/converter/number-converter
diff --git a/node_modules/montage/core/converter/currency-converter.js b/node_modules/montage/core/converter/currency-converter.js
index ca32fe7e..712ce306 100755
--- a/node_modules/montage/core/converter/currency-converter.js
+++ b/node_modules/montage/core/converter/currency-converter.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/core/converter/currency-converter
+    @module montage/core/converter/currency-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
     @requires montage/core/converter/number-converter
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index 38ad8f96..0c0ae09a 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
   @website: http://www.datejs.com/
   */
 /**
-        @module montage/core/converter/date-converter
+    @module montage/core/converter/date-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
 */
@@ -2277,14 +2277,14 @@ var Montage = require("montage").Montage,
 
     var _F = {
         //"M/d/yyyy": function (s) {
-        //      var m = s.match(/^([0-2]\d|3[0-1]|\d)\/(1[0-2]|0\d|\d)\/(\d\d\d\d)/);
-        //      if (m!=null) {
-        //              var r =  [ t.month.call(this,m[1]), t.day.call(this,m[2]), t.year.call(this,m[3]) ];
-        //              r = t.finishExact.call(this,r);
-        //              return [ r, "" ];
-        //      } else {
-        //              throw new Date.Parsing.Exception(s);
-        //      }
+        //  var m = s.match(/^([0-2]\d|3[0-1]|\d)\/(1[0-2]|0\d|\d)\/(\d\d\d\d)/);
+        //  if (m!=null) {
+        //      var r =  [ t.month.call(this,m[1]), t.day.call(this,m[2]), t.year.call(this,m[3]) ];
+        //      r = t.finishExact.call(this,r);
+        //      return [ r, "" ];
+        //  } else {
+        //      throw new Date.Parsing.Exception(s);
+        //  }
         //}
         //"M/d/yyyy": function (s) { return [ new Date(Date._parse(s)), ""]; }
     };
diff --git a/node_modules/montage/core/converter/lower-case-converter.js b/node_modules/montage/core/converter/lower-case-converter.js
index 90e6ec55..d5478a03 100755
--- a/node_modules/montage/core/converter/lower-case-converter.js
+++ b/node_modules/montage/core/converter/lower-case-converter.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/core/converter/lower-case-converter
+    @module montage/core/converter/lower-case-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
 */
diff --git a/node_modules/montage/core/converter/new-line-to-br-converter.js b/node_modules/montage/core/converter/new-line-to-br-converter.js
index e3cdaa6b..c9f511f6 100755
--- a/node_modules/montage/core/converter/new-line-to-br-converter.js
+++ b/node_modules/montage/core/converter/new-line-to-br-converter.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/core/converter/new-line-to-br-converter
+    @module montage/core/converter/new-line-to-br-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
 */
diff --git a/node_modules/montage/core/converter/number-converter.js b/node_modules/montage/core/converter/number-converter.js
index 4db5606a..9a11ba97 100755
--- a/node_modules/montage/core/converter/number-converter.js
+++ b/node_modules/montage/core/converter/number-converter.js
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // limitations under the License.
 //
 /**
-        @module montage/core/converter/number-converter
+    @module montage/core/converter/number-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
 */
diff --git a/node_modules/montage/core/converter/trim-converter.js b/node_modules/montage/core/converter/trim-converter.js
index faabd2d7..67166e6a 100755
--- a/node_modules/montage/core/converter/trim-converter.js
+++ b/node_modules/montage/core/converter/trim-converter.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/core/converter/trim-converter
+    @module montage/core/converter/trim-converter
     @requires montage/core/core
     @requires montage/core/converter/converter
 */