Merge pull request #3647 from Mailaender/ip2geo

Show locations of client and servers using a local GeoIP database
2013-08-11 03:21:23 -07:00
parent 119f9b9ff0 c034715f69
commit 59d821b8ef
26 changed files with 6293 additions and 15 deletions
--- a/OpenRA.FileFormats/OpenRA.FileFormats.csproj
+++ b/OpenRA.FileFormats/OpenRA.FileFormats.csproj
@@ -129,7 +129,7 @@
    <Compile Include="Support\Log.cs" />
    <Compile Include="Support\Stopwatch.cs" />
    <Compile Include="Support\Timer.cs" />
-    <Compile Include="Thirdparty\Random.cs" />
+    <Compile Include="Random.cs" />
    <Compile Include="TypeDictionary.cs" />
    <Compile Include="WPos.cs" />
    <Compile Include="WVec.cs" />
--- a/OpenRA.FileFormats/Thirdparty/Random.cs
+++ b/OpenRA.FileFormats/Thirdparty/Random.cs