diff options
author | Jose Antonio Marquez | 2012-06-26 13:40:44 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-26 13:40:44 -0700 |
commit | 81747f839bf5d176a15511303f7d2a0e4028e5bb (patch) | |
tree | 5afab7fb834f9df27d2bf35f6414a906c27ec598 /js/document/models/html.js | |
parent | 9ebf80d943b894242d90cf62bc3078c6a83041ad (diff) | |
parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
download | ninja-81747f839bf5d176a15511303f7d2a0e4028e5bb.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/document/models/html.js')
-rwxr-xr-x | js/document/models/html.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/models/html.js b/js/document/models/html.js index 4a232ee1..d9002b4e 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
@@ -68,9 +68,10 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
68 | // | 68 | // |
69 | webGlHelper: { | 69 | webGlHelper: { |
70 | value: null | 70 | value: null |
71 | }, | 71 | } |
72 | //////////////////////////////////////////////////////////////////// | 72 | //////////////////////////////////////////////////////////////////// |
73 | //////////////////////////////////////////////////////////////////// | 73 | //////////////////////////////////////////////////////////////////// |
74 | |||
74 | }); | 75 | }); |
75 | //////////////////////////////////////////////////////////////////////// | 76 | //////////////////////////////////////////////////////////////////////// |
76 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | 77 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file |