diff options
author | Euphy <euphy@rathena.org> | 2013-06-22 11:29:06 -0400 |
---|---|---|
committer | Euphy <euphy@rathena.org> | 2013-06-22 11:29:06 -0400 |
commit | f5b942ffa9df2a0067915726590b9fd6eed1aaeb (patch) | |
tree | d16096a063fb18a4b8309b282b22159ed608e654 /Hercules-10.sln | |
parent | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (diff) | |
parent | 7649864de078d9d72f0a554439562c883a77d64b (diff) | |
download | hercules-f5b942ffa9df2a0067915726590b9fd6eed1aaeb.tar.gz hercules-f5b942ffa9df2a0067915726590b9fd6eed1aaeb.tar.bz2 hercules-f5b942ffa9df2a0067915726590b9fd6eed1aaeb.tar.xz hercules-f5b942ffa9df2a0067915726590b9fd6eed1aaeb.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Hercules-10.sln')
-rwxr-xr-x[-rw-r--r--] | Hercules-10.sln | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Hercules-10.sln b/Hercules-10.sln index 997df68af..f8bbc88c1 100644..100755 --- a/Hercules-10.sln +++ b/Hercules-10.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-10\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-10\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" @@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-10\map EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-10\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-10\plugin-sample.vcxproj", "{F4A5705B-BED6-47AB-9135-2D39838F14DC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -32,10 +32,8 @@ Global {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.Build.0 = Release|Win32 - {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.Build.0 = Debug|Win32 - {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.ActiveCfg = Release|Win32 - {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.Build.0 = Release|Win32 + {F4A5705B-BED6-47AB-9135-2D39838F14DC}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4A5705B-BED6-47AB-9135-2D39838F14DC}.Release|Win32.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |