Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 2 insertions, 2 deletions

diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js
index f047224d..bda9f317 100755
--- a/js/lib/geom/sub-path.js
+++ b/js/lib/geom/sub-path.js
@@ -78,7 +78,7 @@ var GLSubpath = function GLSubpath() {
     //drawing context
     this._world = null;
     this._canvas = null; //todo this might be unnecessary (but faster) since we can get it from the world
-    
+
     //tool that owns this subpath
     this._drawingTool = null;
 
@@ -380,7 +380,7 @@ GLSubpath.prototype.removeAnchor = function (index) {
             retAnchor = this._Anchors.splice(index, 1);
         }
         this.makeDirty();
-        
+
     }
     //deselect any selected anchor point
     this.deselectAnchorPoint();