Tahir Akhlaq 335a59204c Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing ... # Conflicts: # FFXIVClassic Map Server/CommandProcessor.cs # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/area/PrivateArea.cs # FFXIVClassic Map Server/actors/area/Zone.cs # FFXIVClassic Map Server/actors/chara/npc/Npc.cs # FFXIVClassic Map Server/common/Utils.cs # FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs		2016-06-14 22:54:02 +01:00
..
AssemblyInfo.cs	servers now log (almost) everything to file	2016-06-09 19:48:06 +01:00
Resources.Designer.cs	Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing	2016-06-14 22:54:02 +01:00
Resources.resx	mass replaced all methods to pascal case	2016-06-14 21:29:10 +01:00