Files
NGECore2/odb
Light2 536b51d953 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
2014-05-01 21:08:20 +02:00
..
2014-04-12 21:52:09 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-06 14:27:55 +02:00
2014-04-01 16:26:35 +02:00
2014-04-01 16:26:35 +02:00
2014-04-01 16:26:35 +02:00