Merge remote-tracking branch 'upstream/master'

8 files changed, 22 insertions, 22 deletions

diff --git a/vcproj-10/char-server.vcxproj b/vcproj-10/char-server.vcxproj
index 34d983d95..f17eb6cd4 100644
--- a/vcproj-10/char-server.vcxproj
+++ b/vcproj-10/char-server.vcxproj
@@ -145,7 +145,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" />
@@ -191,7 +191,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-10/char-server.vcxproj.filters b/vcproj-10/char-server.vcxproj.filters
index b3b9e49cd..2f232b2cc 100644
--- a/vcproj-10/char-server.vcxproj.filters
+++ b/vcproj-10/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-10/login-server.vcxproj b/vcproj-10/login-server.vcxproj
index 941a2f859..b7b020b03 100644
--- a/vcproj-10/login-server.vcxproj
+++ b/vcproj-10/login-server.vcxproj
@@ -154,7 +154,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" />
@@ -187,7 +187,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-10/login-server.vcxproj.filters b/vcproj-10/login-server.vcxproj.filters
index 6d83824eb..27bad5e85 100644
--- a/vcproj-10/login-server.vcxproj.filters
+++ b/vcproj-10/login-server.vcxproj.filters
@@ -28,7 +28,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">
@@ -126,7 +126,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-10/map-server.vcxproj b/vcproj-10/map-server.vcxproj
index 634fd19f4..cbd4706c4 100644
--- a/vcproj-10/map-server.vcxproj
+++ b/vcproj-10/map-server.vcxproj
@@ -137,14 +137,14 @@
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\core.h" />
-	<ClInclude Include="..\src\common\console.h" />
+    <ClInclude Include="..\src\common\console.h" />
     <ClInclude Include="..\src\common\db.h" />
     <ClInclude Include="..\src\common\des.h" />
     <ClInclude Include="..\src\common\ers.h" />
     <ClInclude Include="..\src\common\HPM.h" />
     <ClInclude Include="..\src\common\HPMi.h" />
     <ClInclude Include="..\src\common\grfio.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" />
@@ -216,13 +216,13 @@
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\core.c" />
-	<ClCompile Include="..\src\common\console.c" />
+    <ClCompile Include="..\src\common\console.c" />
     <ClCompile Include="..\src\common\db.c" />
     <ClCompile Include="..\src\common\des.c" />
     <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" />
@@ -291,4 +291,4 @@
     <Copy SourceFiles="..\conf\import-tmpl\packet_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\packet_conf.txt')" />
     <Copy SourceFiles="..\conf\import-tmpl\script_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\script_conf.txt')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vcproj-10/map-server.vcxproj.filters b/vcproj-10/map-server.vcxproj.filters
index 4bdbf6012..997a2970d 100644
--- a/vcproj-10/map-server.vcxproj.filters
+++ b/vcproj-10/map-server.vcxproj.filters
@@ -118,7 +118,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\des.c">
@@ -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">
@@ -327,7 +327,7 @@
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
-	<ClInclude Include="..\src\common\console.h">
+    <ClInclude Include="..\src\common\console.h">
       <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\db.h">
@@ -348,7 +348,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-10/mapcache.vcxproj b/vcproj-10/mapcache.vcxproj
index 3cdb7b96a..980f31d10 100644
--- a/vcproj-10/mapcache.vcxproj
+++ b/vcproj-10/mapcache.vcxproj
@@ -127,7 +127,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" />
@@ -141,7 +141,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-10/mapcache.vcxproj.filters b/vcproj-10/mapcache.vcxproj.filters
index 32479a909..903d34522 100644
--- a/vcproj-10/mapcache.vcxproj.filters
+++ b/vcproj-10/mapcache.vcxproj.filters
@@ -4,7 +4,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\des.c">
@@ -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">