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-12/char-server.vcxproj | |
| 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-12/char-server.vcxproj')
| -rw-r--r-- | vcproj-12/char-server.vcxproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index 5a86a402f..ad2f60c34 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -147,7 +147,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" /> @@ -193,7 +193,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" /> |