diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/lib/geom/sub-path.js | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/lib/geom/sub-path.js')
| -rwxr-xr-x | js/lib/geom/sub-path.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js index 56c94df3..4c5fe1eb 100755 --- a/js/lib/geom/sub-path.js +++ b/js/lib/geom/sub-path.js | |||
| @@ -232,7 +232,7 @@ var GLSubpath = function GLSubpath() { | |||
| 232 | 232 | ||
| 233 | }; //function GLSubpath ...class definition | 233 | }; //function GLSubpath ...class definition |
| 234 | 234 | ||
| 235 | GLSubpath.prototype = new GeomObj(); | 235 | GLSubpath.prototype = Object.create(GeomObj, {}); |
| 236 | 236 | ||
| 237 | ///////////////////////////////////////////////////////// | 237 | ///////////////////////////////////////////////////////// |
| 238 | // Property Accessors/Setters | 238 | // Property Accessors/Setters |