aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.js.orig
Commit message (Collapse)AuthorAge
* 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>