diff options
| author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
| commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
| tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /js/document/models/html.js | |
| parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
| parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
| download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 |