Mads Boddum 8bc33ac932 Merge holocore/quality_assurance into expertise_training ...

Conflicts:
	src/services/experience/SkillService.java
	src/services/experience/SkillTemplateService.java
	src/services/player/CharacterCreationService.java

2016-10-29 08:09:36 +02:00

..

encryption

Added license to a few files

2016-05-24 11:50:02 -05:00

packets

Merge holocore/quality_assurance into expertise_training

2016-10-29 08:09:36 +02:00

NetworkClient.java

Simplied some network code

2016-05-24 09:38:45 -05:00

PacketReceiver.java

Added license to a few files

2016-05-24 11:50:02 -05:00

PacketSender.java

Added license to a few files

2016-05-24 11:50:02 -05:00

PacketType.java

Merge holocore/quality_assurance into expertise_training

2016-10-27 13:32:20 +02:00