diff options
author | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
---|---|---|
committer | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
commit | 198aef7133713b47a4c4fadaac6811c9d3812d19 (patch) | |
tree | 84df335dd0ad350c20f8c2a018b2a7096907b636 /vcproj-14 | |
parent | 6977d6d31b58afc5095c0a59e754f21ea1080054 (diff) | |
parent | 8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff) | |
download | hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.gz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.bz2 hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.xz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'vcproj-14')
-rw-r--r-- | vcproj-14/char-server.vcxproj | 4 | ||||
-rw-r--r-- | vcproj-14/char-server.vcxproj.filters | 4 | ||||
-rw-r--r-- | vcproj-14/login-server.vcxproj | 4 | ||||
-rw-r--r-- | vcproj-14/login-server.vcxproj.filters | 6 | ||||
-rw-r--r-- | vcproj-14/map-server.vcxproj | 4 | ||||
-rw-r--r-- | vcproj-14/map-server.vcxproj.filters | 4 | ||||
-rw-r--r-- | vcproj-14/mapcache.vcxproj | 4 | ||||
-rw-r--r-- | vcproj-14/mapcache.vcxproj.filters | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/vcproj-14/char-server.vcxproj b/vcproj-14/char-server.vcxproj index 565b99ce6..dd3f53526 100644 --- a/vcproj-14/char-server.vcxproj +++ b/vcproj-14/char-server.vcxproj @@ -146,7 +146,7 @@ <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> <ClInclude Include="..\src\common\HPMi.h" /> - <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\memmgr.h" /> <ClInclude Include="..\src\common\mapindex.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\mutex.h" /> @@ -192,7 +192,7 @@ <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> - <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\memmgr.c" /> <ClCompile Include="..\src\common\mapindex.c" /> <ClCompile Include="..\src\common\mutex.c" /> <ClCompile Include="..\src\common\nullpo.c" /> diff --git a/vcproj-14/char-server.vcxproj.filters b/vcproj-14/char-server.vcxproj.filters index b3b9e49cd..2f232b2cc 100644 --- a/vcproj-14/char-server.vcxproj.filters +++ b/vcproj-14/char-server.vcxproj.filters @@ -19,7 +19,7 @@ <ClCompile Include="..\src\common\HPM.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\malloc.c"> + <ClCompile Include="..\src\common\memmgr.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\mapindex.c"> @@ -153,7 +153,7 @@ <ClInclude Include="..\src\common\HPMi.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\malloc.h"> + <ClInclude Include="..\src\common\memmgr.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\mapindex.h"> diff --git a/vcproj-14/login-server.vcxproj b/vcproj-14/login-server.vcxproj index ca8d0cf23..5589cc35d 100644 --- a/vcproj-14/login-server.vcxproj +++ b/vcproj-14/login-server.vcxproj @@ -156,7 +156,7 @@ <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> <ClInclude Include="..\src\common\HPMi.h" /> - <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\memmgr.h" /> <ClInclude Include="..\src\common\md5calc.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\nullpo.h" /> @@ -189,7 +189,7 @@ <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> - <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\memmgr.c" /> <ClCompile Include="..\src\common\md5calc.c" /> <ClCompile Include="..\src\common\nullpo.c" /> <ClCompile Include="..\src\common\random.c" /> diff --git a/vcproj-14/login-server.vcxproj.filters b/vcproj-14/login-server.vcxproj.filters index 3bdb93f6f..0d27feaea 100644 --- a/vcproj-14/login-server.vcxproj.filters +++ b/vcproj-14/login-server.vcxproj.filters @@ -22,7 +22,7 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\console.c"> + <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\db.c"> @@ -34,7 +34,7 @@ <ClCompile Include="..\src\common\HPM.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\malloc.c"> + <ClCompile Include="..\src\common\memmgr.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\md5calc.c"> @@ -132,7 +132,7 @@ <ClInclude Include="..\src\common\HPMi.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\malloc.h"> + <ClInclude Include="..\src\common\memmgr.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\md5calc.h"> diff --git a/vcproj-14/map-server.vcxproj b/vcproj-14/map-server.vcxproj index 264bd2365..425c864f6 100644 --- a/vcproj-14/map-server.vcxproj +++ b/vcproj-14/map-server.vcxproj @@ -146,7 +146,7 @@ <ClInclude Include="..\src\common\grfio.h" /> <ClInclude Include="..\src\common\HPM.h" /> <ClInclude Include="..\src\common\HPMi.h" /> - <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\memmgr.h" /> <ClInclude Include="..\src\common\mapindex.h" /> <ClInclude Include="..\src\common\md5calc.h" /> <ClInclude Include="..\src\common\mmo.h" /> @@ -224,7 +224,7 @@ <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\grfio.c" /> <ClCompile Include="..\src\common\HPM.c" /> - <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\memmgr.c" /> <ClCompile Include="..\src\common\mapindex.c" /> <ClCompile Include="..\src\common\md5calc.c" /> <ClCompile Include="..\src\common\mutex.c" /> diff --git a/vcproj-14/map-server.vcxproj.filters b/vcproj-14/map-server.vcxproj.filters index 8347c134a..40ace58c8 100644 --- a/vcproj-14/map-server.vcxproj.filters +++ b/vcproj-14/map-server.vcxproj.filters @@ -136,7 +136,7 @@ <ClCompile Include="..\src\common\HPM.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\malloc.c"> + <ClCompile Include="..\src\common\memmgr.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\mapindex.c"> @@ -349,7 +349,7 @@ <ClInclude Include="..\src\common\HPMi.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\malloc.h"> + <ClInclude Include="..\src\common\memmgr.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\mapindex.h"> diff --git a/vcproj-14/mapcache.vcxproj b/vcproj-14/mapcache.vcxproj index 1d08545e9..7304b8df4 100644 --- a/vcproj-14/mapcache.vcxproj +++ b/vcproj-14/mapcache.vcxproj @@ -129,7 +129,7 @@ <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\des.c" /> <ClCompile Include="..\src\common\grfio.c" /> - <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\memmgr.c" /> <ClCompile Include="..\src\common\showmsg.c" /> <ClCompile Include="..\src\common\strlib.c" /> <ClCompile Include="..\src\common\sysinfo.c" /> @@ -143,7 +143,7 @@ <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\des.h" /> <ClInclude Include="..\src\common\grfio.h" /> - <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\memmgr.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\showmsg.h" /> <ClInclude Include="..\src\common\strlib.h" /> diff --git a/vcproj-14/mapcache.vcxproj.filters b/vcproj-14/mapcache.vcxproj.filters index d5c2fbb83..957cabac8 100644 --- a/vcproj-14/mapcache.vcxproj.filters +++ b/vcproj-14/mapcache.vcxproj.filters @@ -13,7 +13,7 @@ <ClCompile Include="..\src\common\grfio.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\malloc.c"> + <ClCompile Include="..\src\common\memmgr.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\showmsg.c"> @@ -51,7 +51,7 @@ <ClInclude Include="..\src\common\grfio.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\malloc.h"> + <ClInclude Include="..\src\common\memmgr.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\mmo.h"> |