#
# ChangeLog for code/branches/presentationFS15merge/data
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 4:21:44 PM

Sun, 04 Oct 2015 10:12:42 GMT landauf [10611]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt (copied)

	merged branch formationFS15


Sun, 04 Oct 2015 10:11:03 GMT landauf [10610]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	merged branch clangenb


Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


Sun, 01 Mar 2015 21:11:26 GMT landauf [10297]
	* code/trunk/data/levels/underAttack.oxw (modified)

	improved underAttack.oxw - now with lots of turrets attached to the ...