Reverted appplication/xml because SVN thinks this is a binary file...

diff --git a/.gitattributes b/.gitattributes
index 64a57f98c398d944ad0a948269668eafce3b23b9..83ecd245622dbb7e904eeab04dfa9cc155e46945 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -217,7 +217,7 @@ application/ship-simu/main/wrapper/class_UserGovernmentDatabaseWrapper.php -text
 application/ship-simu/starter.php -text svneol=unset#text/plain
 application/ship-simu/templates/.htaccess -text svneol=unset#text/plain
 application/ship-simu/templates/de/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/de/.xml -text svneol=unset#text/xml
+application/ship-simu/templates/de/.xml -text svneol=unset#text/plain
 application/ship-simu/templates/de/code/action_ship_simu_login_company.ctp -text svneol=unset#text/plain
 application/ship-simu/templates/de/code/action_ship_simu_login_government_startup_help.ctp -text svneol=unset#text/plain
 application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp -text svneol=unset#text/plain
@@ -250,101 +250,101 @@ application/ship-simu/templates/de/emails/text_resend_link.tpl -text svneol=unse
 application/ship-simu/templates/de/html/.htaccess -text svneol=unset#text/plain
 application/ship-simu/templates/de/html/nav_advert.tpl -text svneol=unset#text/plain
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text svneol=unset#text/plain
-application/ship-simu/templates/de/image/base_code.xml -text svneol=unset#text/xml
+application/ship-simu/templates/de/image/base_code.xml -text svneol=unset#text/plain
 application/ship-simu/templates/de/image/code_captcha.img -text
 application/ship-simu/templates/de/image/emergency_exit.img -text
 application/ship-simu/templates/de/menu/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/de/menu/base_menu.xml -text svneol=unset#text/xml
-application/ship-simu/templates/de/menu/generic_menu_entries.xml -text svneol=unset#text/xml
+application/ship-simu/templates/de/menu/base_menu.xml -text svneol=unset#text/plain
+application/ship-simu/templates/de/menu/generic_menu_entries.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/!MISSING -text
 application/ship-simu/templates/game/.htaccess -text svneol=unset#text/plain
 application/ship-simu/templates/game/building/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/building/advanced_research_lab.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/building/base_building.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/building/research_lab.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/building/advanced_research_lab.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/building/base_building.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/building/research_lab.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/chemicals/.htaccess -text svneol=unset#text/plain
 application/ship-simu/templates/game/company/.htaccess -text svneol=unset#text/plain
 application/ship-simu/templates/game/container/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/container/base_container.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/container/base_container.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/contract/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/contract/base_contract.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/contract/base_contract.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/drink/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/drink/base_drink.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/drink/base_drink.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/electronic/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/electronic/base_electronic.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/electronic/cellphone.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/electronic/hifi_system.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/electronic/radio_receiver.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/electronic/surround_system.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/electronic/television.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/electronic/base_electronic.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/electronic/cellphone.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/electronic/hifi_system.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/electronic/radio_receiver.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/electronic/surround_system.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/electronic/television.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/engine/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/engine/base_engine.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/engine/base_engine.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/farmer/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/farmer/base_farmer.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/farmer/base_farmer.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/fruit/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/fruit/base_fruit.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/fruit/base_fruit.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/fuel/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/fuel/base_fuel.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/fuel/base_fuel.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/grain/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/grain/base_grain.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/grain/base_grain.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/lifestock/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/lifestock/base_lifestock.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/lifestock/base_lifestock.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/merchant/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/merchant/base_merchant.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/merchant/base_merchant.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/mineral/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/mineral/base_mineral.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/mineral/base_mineral.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/produce/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/produce/base_produce.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/produce/base_produce.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/research/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/research/base_research.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/research/electricity.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/research/electronics.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/research/mathematics.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/research/radio_receiving.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/research/statics.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/research/base_research.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/research/electricity.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/research/electronics.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/research/mathematics.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/research/radio_receiving.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/research/statics.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/resource/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/resource/base_resource.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/resource/base_resource.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/ship/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/ship/base_ship.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/ship/base_ship.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/tank/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/tank/base_tank.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/tank/base_tank.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/technology/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/technology/architecture.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/base_technology.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/cellular_network.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/drawings.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/glass_making.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/household_devices.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/intergrated_currents.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/laboratory_equipment.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/naval_architecture.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/plastics.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/signal_amplifying.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/signal_modulation.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/sound_equalizer.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/sound_processor.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/surround_mixing.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/transistor.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/technology/video_receiving.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/technology/architecture.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/base_technology.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/cellular_network.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/drawings.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/glass_making.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/household_devices.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/intergrated_currents.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/laboratory_equipment.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/naval_architecture.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/plastics.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/signal_amplifying.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/signal_modulation.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/sound_equalizer.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/sound_processor.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/surround_mixing.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/transistor.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/technology/video_receiving.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/types/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/types/building_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/container_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/content_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/contract_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/electronic_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/engine_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/farmer_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/fuel_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/merchant_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/owner_occupants.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/product_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/research_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/ship_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/signer_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/tank_types.xml -text svneol=unset#application/xml
-application/ship-simu/templates/game/types/technology_types.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/types/building_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/container_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/content_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/contract_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/electronic_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/engine_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/farmer_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/fuel_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/merchant_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/owner_occupants.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/product_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/research_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/ship_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/signer_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/tank_types.xml -text svneol=unset#text/plain
+application/ship-simu/templates/game/types/technology_types.xml -text svneol=unset#text/plain
 application/ship-simu/templates/game/vegetable/.htaccess -text svneol=unset#text/plain
-application/ship-simu/templates/game/vegetable/base_vegetable.xml -text svneol=unset#application/xml
+application/ship-simu/templates/game/vegetable/base_vegetable.xml -text svneol=unset#text/plain
 /clear-cache.sh -text
 db/.htaccess -text
 db/company/.htaccess -text