diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/document/models/html.js | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 |