Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	Resolved by using both; both were needed.

1 files changed, 4 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index c790466c..aafc3d1d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -509,6 +509,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
         set:function (newVal) {
             if (newVal !== this._millisecondsOffset) {
+
+                var tempValue = (1/newVal) * 1000000;
+                newVal = tempValue;
+
                 this._millisecondsOffset= newVal;
                 this.drawTimeMarkers();
                 NJevent('tlZoomSlider',this);