zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-08 05:24:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
Tahir Akhlaq 2017-07-08 04:10:36 +01:00
commit 4695193aa0
235 changed files with 2840 additions and 1024 deletions
Download patch file Download diff file Expand all files Collapse all files

1
FFXIVClassic Map Server/Program.cs
View file

@ -22,7 +22,6 @@ namespace FFXIVClassic_Map_Server
static void Main(string[] args)
{
// set up logging
Log = LogManager.GetCurrentClassLogger();
#if DEBUG