Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 12 insertions, 0 deletions

diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.css b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.css
new file mode 100644
index 00000000..972c41f5
--- /dev/null
+++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.css
@@ -0,0 +1,12 @@
+/* <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> */
+ .montage-autocomplete {
+     padding-right: 20px;
+ }
+ .montage-autocomplete-loading {
+     background: url('loading.gif') no-repeat;
+     background-position: right;
+ }
\ No newline at end of file