aboutsummaryrefslogtreecommitdiff
path: root/js/components/core/class-uuid.js
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/core/class-uuid.js
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/core/class-uuid.js')
-rwxr-xr-xjs/components/core/class-uuid.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/core/class-uuid.js b/js/components/core/class-uuid.js
index 6c5530c4..010495e7 100755
--- a/js/components/core/class-uuid.js
+++ b/js/components/core/class-uuid.js
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
33 </notice> */ 33 </notice> */
34 34
35/** 35/**
36 @module components/core/class-uuid 36 @module components/core/class-uuid
37 @requires montage/core/core 37 @requires montage/core/core
38*/ 38*/
39/** 39/**
@@ -62,7 +62,7 @@ var Montage = require("montage/core/core").Montage,
62 id[2] = c[(r >>>= 4) & 0xf]; 62 id[2] = c[(r >>>= 4) & 0xf];
63 id[3] = c[(r >>>= 4) & 0xf]; 63 id[3] = c[(r >>>= 4) & 0xf];
64 id[4] = c[(r >>>= 4) & 0xf]; 64 id[4] = c[(r >>>= 4) & 0xf];
65 65
66 return id.join(''); 66 return id.join('');
67 } 67 }
68 } 68 }