aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>