[Orxonox-commit 7164] r11781 - in code/branches/Presentation_HS17_merge: data/gui/layouts data/gui/scripts data/levels data/levels/includes data/levels/templates data/overlays src/modules/asteroidmining src/modules/asteroids2D src/modules/dialog src/modules/flappyorx src/modules/overlays/hud src/modules/superorxobros src/modules/weapons/munitions src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox src/orxonox/controllers src/orxonox/gametypes src/orxonox/worldentities src/orxonox/worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-19 23:48:23 +0100 (Mon, 19 Feb 2018)
New Revision: 11781

Modified:
   code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
   code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout
   code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua
   code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua
   code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua
   code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw
   code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw
   code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw
   code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw
   code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw
   code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
   code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw
   code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw
   code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw
   code/branches/Presentation_HS17_merge/data/levels/SOB.oxw
   code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw
   code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi
   code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi
   code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw
   code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt
   code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt
   code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo
   code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo
   code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo
   code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo
   code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h
   code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt
   code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc
   code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc
   code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt
   code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc
   code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc
   code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc
   code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
   code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc
   code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h
   code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc
   code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
   code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h
   code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc
   code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h
   code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc
   code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h
   code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc
   code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h
   code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc
   code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h
   code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc
   code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h
   code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
   code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc
   code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h
Log:
eol-style native (no changes in code)

Index: code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/SOB.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/SOB.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/SOB.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/SOB.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h	2018-02-19 21:51:15 UTC (rev 11780)
+++ code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h	2018-02-19 22:48:23 UTC (rev 11781)

Property changes on: code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property