Merge branch 'proxy_server' into develop

# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
This commit is contained in:
Filip Maj committed 2016-12-03 14:03:13 -05:00
commit 3864bf6d85
195 files changed
+5926 -1601

No files matched your search

@@ -1,7 +1,8 @@
using FFXIVClassic_Map_Server.packets;
using System.Collections.Generic;
using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.Actors;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.utils
{