diff options
| author | Jon Reid | 2012-03-16 13:42:56 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-03-16 13:42:56 -0700 |
| commit | f898e3c535da1ec2d6e08bb61c755b8df10da0b1 (patch) | |
| tree | 3aa61d32eac84572bf1b456c78775cd9900d1bd3 /js/panels/Timeline/Layer.reel/Layer.js | |
| parent | 3bebf2b279d8f4da0439a4e3de1254c4292d0cac (diff) | |
| parent | 47c7ba7a500082af0268b39ebbbbe926fa284920 (diff) | |
| download | ninja-f898e3c535da1ec2d6e08bb61c755b8df10da0b1.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index b54d6ce0..5287ce28 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
| @@ -823,4 +823,4 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
| 823 | } | 823 | } |
| 824 | /* End: Logging routines */ | 824 | /* End: Logging routines */ |
| 825 | 825 | ||
| 826 | }); \ No newline at end of file | 826 | }); |