Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-08 18:29:31 +02:00
commit a484a4aa53

View file

@ -1221,7 +1221,7 @@ void CPatchManager::readDescFile(sint32 nVersion)
#if defined(NL_OS_WIN64) #if defined(NL_OS_WIN64)
platformPatchCategory = "main_exedll_win64"; platformPatchCategory = "main_exedll_win64";
#elif defined(NL_OS_WIN32) #elif defined(NL_OS_WINDOWS)
platformPatchCategory = "main_exedll_win32"; platformPatchCategory = "main_exedll_win32";
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
platformPatchCategory = "main_exedll_osx"; platformPatchCategory = "main_exedll_osx";