diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /js/helper-classes/RDGE/GLBrushStroke.js | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'js/helper-classes/RDGE/GLBrushStroke.js')
| -rw-r--r-- | js/helper-classes/RDGE/GLBrushStroke.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js index 89292ad8..e3b14bf7 100644 --- a/js/helper-classes/RDGE/GLBrushStroke.js +++ b/js/helper-classes/RDGE/GLBrushStroke.js | |||
| @@ -4,6 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | // Todo: This shoudl be converted to a module | ||
| 7 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 8 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
| 8 | 9 | ||
| 9 | 10 | ||