Mads Boddum 29c4ed2ac3 Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	src/network/packets/swg/zone/UpdateTransformWithParentMessage.java
	src/resources/commands/callbacks/RevertAppearanceCallback.java
	src/resources/objects/SWGObject.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/services/objects/ObjectAwareness.java
	src/services/player/CharacterCreationService.java

2016-07-01 03:00:27 +02:00

..

combat_xp_multipliers.sdb

Merge holocore/quality_assurance into quality_assurance

2016-07-01 03:00:27 +02:00

player_level.sdb

Merge holocore/quality_assurance into new_forwarder

2016-05-14 13:15:16 +02:00