Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.js b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
deleted file mode 100644
index 54b84425..00000000
--- a/node_modules/montage/examples/feed-reader/map-example.reel/main.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-
-exports.Main = Montage.create(Component, {
-
-    templateDidLoad: {
-        value: function() {
-            //console.log("main templateDidLoad")
-        }
-    },
-
-    prepareForDraw: {
-        value: function() {
-            //console.log("main prepareForDraw")
-        }
-    }
-
-});