Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 26 insertions, 0 deletions

diff --git a/js/panels/history-panel/history.reel/history.js b/js/panels/history-panel/history.reel/history.js
new file mode 100644
index 00000000..241286fb
--- /dev/null
+++ b/js/panels/history-panel/history.reel/history.js
@@ -0,0 +1,26 @@
+/* <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.History = Montage.create(Component, {
+    historyList: {
+        value: null
+    },
+
+    didCreate: {
+        value: function() {
+        }
+    },
+
+    templateDidLoad: {
+        value: function() {
+        }
+    }
+
+
+});
\ No newline at end of file