diff options
| author | Kruti Shah | 2012-07-09 11:27:16 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-09 11:27:16 -0700 |
| commit | 5ad509e46add1b45d15d1c493e18a5c52a462654 (patch) | |
| tree | 93cd416cd7060e3688f33545f70956f787f6886f /js/panels | |
| parent | 6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff) | |
| parent | 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff) | |
| download | ninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode
Conflicts:
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels')