Index: ps/trunk/binaries/data/mods/public/gui/common/setup_resources.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/setup_resources.xml	(revision 24530)
+++ ps/trunk/binaries/data/mods/public/gui/common/setup_resources.xml	(nonexistent)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<setup>
-	<icon name="icon_food"
-		sprite="stretched:session/icons/resources/food_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_metal"
-		sprite="stretched:session/icons/resources/metal_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_population"
-		sprite="stretched:session/icons/resources/population_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_stone"
-		sprite="stretched:session/icons/resources/stone_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_wood"
-		sprite="stretched:session/icons/resources/wood_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_time"
-		sprite="stretched:session/icons/resources/time_small.png"
-		size="16 16"
-	/>
-	<icon name="icon_xp"
-		sprite="stretched:session/icons/promote.png"
-		size="16 16"
-	/>
-</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/setup_resources.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/food.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/food.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/food.xml	(revision 24531)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_food"
+		sprite="stretched:session/icons/resources/food_small.png"
+		size="16 16"
+	/>
+</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/resources/food.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/metal.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/metal.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/metal.xml	(revision 24531)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_metal"
+		sprite="stretched:session/icons/resources/metal_small.png"
+		size="16 16"
+	/>
+</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/resources/metal.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/setup_resources.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/setup_resources.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/setup_resources.xml	(revision 24531)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_population"
+		sprite="stretched:session/icons/resources/population_small.png"
+		size="16 16"
+	/>
+	<icon name="icon_time"
+		sprite="stretched:session/icons/resources/time_small.png"
+		size="16 16"
+	/>
+	<icon name="icon_xp"
+		sprite="stretched:session/icons/promote.png"
+		size="16 16"
+	/>
+</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/resources/setup_resources.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/stone.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/stone.xml	(revision 24531)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_stone"
+		sprite="stretched:session/icons/resources/stone_small.png"
+		size="16 16"
+	/>
+</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/resources/stone.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/common/resources/wood.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/resources/wood.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/gui/common/resources/wood.xml	(revision 24531)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+	<icon name="icon_wood"
+		sprite="stretched:session/icons/resources/wood_small.png"
+		size="16 16"
+	/>
+</setup>

Property changes on: ps/trunk/binaries/data/mods/public/gui/common/resources/wood.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/page_session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_session.xml	(revision 24530)
+++ ps/trunk/binaries/data/mods/public/gui/page_session.xml	(revision 24531)
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/resources/</include>
+
 	<include>common/setup.xml</include>
-	<include>common/setup_resources.xml</include>
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
 	<include>session/sprites.xml</include>
 	<include>session/styles.xml</include>
 	<include>session/session.xml</include>
 
 	<!-- Work around a render bug:
 	     Needs to be drawn last, as it should overlay everything -->
 	<include>common/global.xml</include>
 </page>
Index: ps/trunk/binaries/data/mods/public/gui/page_structree.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_structree.xml	(revision 24530)
+++ ps/trunk/binaries/data/mods/public/gui/page_structree.xml	(revision 24531)
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
-	<include>common/setup_resources.xml</include>
+	<include>common/resources/</include>
+
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
 	<include>reference/common/sprites.xml</include>
 	<include>reference/common/styles.xml</include>
 
 	<include>reference/structree/sprites.xml</include>
 	<include>reference/structree/styles.xml</include>
 	<include>reference/structree/structree.xml</include>
 
 	<include>reference/common/setup.xml</include>
 </page>
Index: ps/trunk/binaries/data/mods/public/gui/page_viewer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/page_viewer.xml	(revision 24530)
+++ ps/trunk/binaries/data/mods/public/gui/page_viewer.xml	(revision 24531)
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page>
 	<include>common/modern/setup.xml</include>
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
-	<include>common/setup_resources.xml</include>
+	<include>common/resources/</include>
+
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
 	<include>reference/common/sprites.xml</include>
 	<include>reference/common/styles.xml</include>
 
 	<include>reference/viewer/styles.xml</include>
 	<include>reference/viewer/sprites.xml</include>
 	<include>reference/viewer/viewer.xml</include>
 
 	<include>reference/common/setup.xml</include>
 </page>