Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 0 insertions, 15 deletions

diff --git a/js/panels/properties/properties-panel.js b/js/panels/properties/properties-panel.js
deleted file mode 100755
index 31bc4919..00000000
--- a/js/panels/properties/properties-panel.js
+++ /dev/null
@@ -1,15 +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;
-var PanelBase = require("js/panels/PanelBase").PanelBase;
-var Content = require("js/panels/properties/content.reel").Content;
-
-exports.PropertiesPanel = Montage.create(PanelBase, {
-    panelName : { value: "Properties" },
-    minHeight : { value: 200 },
-    content : { value: Content }
-});
\ No newline at end of file