[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58115] branches/ soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_properties. py: repair bad merge

[Campbell Barton]

Revision: 58115
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58115
Author:   campbellbarton
Date:     2013-07-09 10:14:01 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
repair bad merge

Added Paths:
-----------
    branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_properties.py

Copied: branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_properties.py (from rev 58114, trunk/blender/release/scripts/startup/bl_ui/space_properties.py)
===================================================================
--- branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_properties.py	                        (rev 0)
+++ branches/soc-2013-meshdata_transfer/release/scripts/startup/bl_ui/space_properties.py	2013-07-09 10:14:01 UTC (rev 58115)
@@ -0,0 +1,46 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+import bpy
+from bpy.types import Header
+
+
+class PROPERTIES_HT_header(Header):
+    bl_space_type = 'PROPERTIES'
+
+    def draw(self, context):
+        layout = self.layout
+
+        view = context.space_data
+
+        row = layout.row()
+        row.template_header(menus=False)
+        row.prop(view, "context", expand=True, icon_only=True)
+
+
+def register():
+    bpy.utils.register_module(__name__)
+
+
+def unregister():
+    bpy.utils.unregister_module(__name__)
+
+
+if __name__ == "__main__":
+    register()