aboutsummaryrefslogtreecommitdiff
path: root/js/document/_toDelete
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Cleaning upJose Antonio Marquez2012-05-30
| | | | | | | | Removing obsolete files.
* | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
|/ | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.