cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Tahir Akhlaq
2016-06-18 05:59:42 +01:00
parent 1ad2b5d7d0 cdf4b3a2f2
commit 37d91480f9
24 changed files with 185 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FFXIVClassic Common Class Lib/packages.config
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="NLog" version="4.3.5" tarGetFramework="net45" targetFramework="net45" />
<package id="NLog" version="4.3.5" targetFramework="net45" targetFramework="net45" />
</packages>