#
# ChangeLog for code/branches/OrxoBlox_FS19/data
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 12:15:46 PM

Thu, 16 May 2019 11:23:16 GMT ahuwyler [12373]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt (modified)

	correct position of spaceship


Thu, 16 May 2019 11:16:55 GMT ahuwyler [12372]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)

	Merge


Thu, 16 May 2019 11:13:58 GMT pomselj [12371]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc (modified)

	BallProjectiles fly


Thu, 16 May 2019 11:13:21 GMT ahuwyler [12370]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt (modified)
	* code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h (modified)

	We have new template


Thu, 16 May 2019 09:11:39 GMT pomselj [12368]
	* code/branches/OrxoBlox_FS19/data/levels/includes/OrxoBloxWeapon.oxi (modified)
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h (modified)

	We can shoot


Thu, 16 May 2019 09:00:57 GMT ahuwyler [12367]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h (modified)

	We have a spaceship!


Thu, 09 May 2019 15:15:43 GMT ahuwyler [12366]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (modified)

	Here and there


Thu, 09 May 2019 14:22:55 GMT jeromela [12364]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)

	orxoblox.oxw: Auskommentiert, orxobloxball.cc: mauskoordinaten
	auslesen.


Thu, 09 May 2019 13:50:09 GMT ahuwyler [12361]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)

	Nomal fuer de Jerome


Thu, 09 May 2019 13:29:29 GMT ahuwyler [12359]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.h (modified)

	fuer de jerome


Thu, 09 May 2019 08:25:24 GMT ahuwyler [12341]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h (modified)

	Wall is ready


Thu, 09 May 2019 07:39:55 GMT jeromela [12339]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)

	spielfeldgroesse


Thu, 02 May 2019 14:40:50 GMT pomselj [12337]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.cc (modified)

	Ball can do bouncy stuff


Thu, 02 May 2019 14:32:19 GMT jeromela [12336]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)

	minor changes


Thu, 02 May 2019 11:38:57 GMT pomselj [12329]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)

	new, better camera


Thu, 02 May 2019 11:35:32 GMT jeromela [12328]
	* code/branches/OrxoBlox_FS19/data/levels/Asteroids2D.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)

	stone is back in the game


Thu, 18 Apr 2019 14:26:49 GMT pomselj [12315]
	* code/branches/OrxoBlox_FS19/data/levels/includes/OrxoBloxWeapon.oxi (added)
	* code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt (added)

	again


Thu, 18 Apr 2019 14:24:49 GMT pomselj [12314]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)

	some stuff, going home tbh


Thu, 18 Apr 2019 14:04:33 GMT pomselj [12310]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/towerDefense.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h (modified)

	oxw file cleaned up


Thu, 18 Apr 2019 13:00:44 GMT ahuwyler [12307]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h (modified)

	A Stone is in the game/ Templates are ajusted


Thu, 18 Apr 2019 11:40:10 GMT jeromela [12305]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/pong.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)

	Ball bewegt sich in zwei Richtungen


Thu, 11 Apr 2019 12:22:31 GMT jeromela [12294]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)

	Spielfeldbegrenzungen umgesetzt


Thu, 04 Apr 2019 14:37:19 GMT pomselj [12281]
	* code/branches/OrxoBlox_FS19/data/levels/towerDefense.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallMunition.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallMunition.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BasicProjectile.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)

	weapon stuff


Thu, 04 Apr 2019 14:17:26 GMT ahuwyler [12278]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h (added)

	Class Wall is created


Thu, 04 Apr 2019 14:16:22 GMT jeromela [12277]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified)

	Spielfeld angepasst. Next: Fumktionalitaet auch anpassen


Thu, 04 Apr 2019 13:22:31 GMT ahuwyler [12270]
	* code/branches/OrxoBlox_FS19/data/levels/OrxoBlox.oxw (deleted)

	deleted .oxw file


Thu, 04 Apr 2019 13:02:27 GMT ahuwyler [12269]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)

	ES FUNKT!


Thu, 04 Apr 2019 12:40:29 GMT ahuwyler [12268]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (modified)

	OrxoBlox in the HUD


Thu, 04 Apr 2019 11:45:35 GMT jeromela [12265]
	* code/branches/OrxoBlox_FS19/data/levels/emptyLevel.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)

	t       <collisionShapes>
	                <BoxCollisionShape ...


Thu, 28 Mar 2019 16:06:31 GMT jeromela [12264]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/tcl/orxokart_highscores.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxAI.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBat.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBot.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.h (deleted)
	* code/branches/OrxoBlox_FS19/src/modules/pong/Pong.cc (modified)

	Struggling with the gametype class!


Thu, 28 Mar 2019 14:39:56 GMT jeromela [12256]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/pong.oxw (modified)
	* code/branches/OrxoBlox_FS19/data/levels/tetris.oxw (modified)

	Level Hintergrund von pong uebernommen


Thu, 21 Mar 2019 14:49:39 GMT jeromela [12215]
	* code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (added)

	included empty OrxoBlox level in Minigames


Thu, 21 Mar 2019 14:49:07 GMT jeromela [12214]
	* code/branches/OrxoBlox_FS19/data/levels/emptyLevel.oxw (modified)

	included empty OrxoBlox level in Minigames


Thu, 21 Mar 2019 13:19:16 GMT ahuwyler [12212]
	* code/branches/OrxoBlox_FS19/data/tcl/orxokart_highscores.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (modified)

	A new Game is born


Thu, 14 Mar 2019 15:01:59 GMT pomselj [12210]
	* code/branches/OrxoBlox_FS19/data/levels/OrxoBlox.oxw (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxPrereqs.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongAI.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBat.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongBot.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongCenterpoint.h (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.cc (added)
	* code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/PongScore.h (added)

	created a folder for our module and started implementing the ball
	class


Thu, 14 Mar 2019 12:20:30 GMT wiesep [12208]
	* code/branches/OrxoBlox_FS19 (copied)

	Create OrxoBlox_FS19 branch


Thu, 07 Mar 2019 13:46:22 GMT wiesep [12201]
	* code/trunk (copied)

	placed new trunk from mergeFS18