diff options
| author | Ananya Sen | 2012-02-18 18:49:45 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-18 18:49:45 -0800 |
| commit | 8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch) | |
| tree | 4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/stage/stage.reel/stage.html | |
| parent | c2a5918480adae0124e1dc2531c019562f1e3e60 (diff) | |
| parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
| download | ninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 9ed0f636..812e3d55 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section id="stageView"></section> | 83 | <section id="stageView"></section> |
| 84 | <section id="iframeContainer"></section> | 84 | <section id="iframeContainer"></section> |
| 85 | <section id="textToolObject">asdasd asd asd asd asd asd </section> | 85 | <section id="textToolObject"></section> |
| 86 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas id="layoutCanvas"></canvas> |
| 87 | <canvas id="stageCanvas"></canvas> | 87 | <canvas id="stageCanvas"></canvas> |
| 88 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas id="drawingCanvas"></canvas> |