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, 16 insertions, 0 deletions

diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js
new file mode 100644
index 00000000..795e74e0
--- /dev/null
+++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js
@@ -0,0 +1,16 @@
+/* <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").Montage,
+    Component = require("ui/component").Component;
+
+exports.ResultsList = Montage.create(Component, {
+    
+    // contentController -> this.repetition.contentController
+    contentController: {value: null},
+    
+    activeIndexes: {value: null}
+
+});