Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
new file mode 100644
index 00000000..b3b8133a
--- /dev/null
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
@@ -0,0 +1,15 @@
+var Montage = require("montage/core/core").Montage;
+var Component = require("montage/ui/component").Component;
+
+var TrackSpacer = exports.TrackSpacer = Montage.create(Component, {
+
+    hasTemplate:{
+        value: true
+    },
+
+    prepareForDraw:{
+        value:function(){
+
+        }
+    }
+});