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

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

1 files changed, 40 insertions, 0 deletions

diff --git a/js/clipboard/internal-ops/timeline-clipboard-agent.js b/js/clipboard/internal-ops/timeline-clipboard-agent.js
new file mode 100644
index 00000000..c086431e
--- /dev/null
+++ b/js/clipboard/internal-ops/timeline-clipboard-agent.js
@@ -0,0 +1,40 @@
+/* <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;
+
+var TimelineClipboardAgent = exports.TimelineClipboardAgent = Montage.create(Component, {
+
+    copy:{
+        value: function(clipboardEvent){
+
+        }
+    },
+
+    cut:{
+        value:function(clipboardEvent){
+
+        }
+
+    },
+
+    pasteFromCopy:{
+        value:function(){
+
+        }
+    },
+
+    pasteFromCut:{
+          value:function(){
+
+          }
+    }
+
+});
\ No newline at end of file