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 /src/map/clif.c | |
| 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 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 8a9d4beb6..d499cf67f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -42,7 +42,7 @@ #include "common/conf.h" #include "common/ers.h" #include "common/grfio.h" -#include "common/malloc.h" +#include "common/memmgr.h" #include "common/mmo.h" // NEW_CARTS #include "common/nullpo.h" #include "common/random.h" |