Tahir Akhlaq 37d91480f9 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands ... # Conflicts: # FFXIVClassic Common Class Lib/packages.config # FFXIVClassic Lobby Server/Program.cs # FFXIVClassic Map Server/CommandProcessor.cs # FFXIVClassic Map Server/Program.cs # FFXIVClassic Map Server/actors/Actor.cs		2016-06-18 05:59:42 +01:00
..
Area.cs	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands	2016-06-18 05:59:42 +01:00
PrivateArea.cs	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing	2016-06-14 22:54:02 +01:00
SpawnLocation.cs	Child scripts now loaded by a uniqueId in the spawn table.	2016-06-09 22:58:03 -04:00
Zone.cs	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing	2016-06-14 22:54:02 +01:00