diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/document/models/html.js | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 |