summaryrefslogtreecommitdiff
path: root/src/login/login.c
diff options
context:
space:
mode:
authorEr_Maqui <er_maqui@darkbolt.net>2015-10-21 14:54:40 +0200
committerEr_Maqui <er_maqui@darkbolt.net>2015-10-21 14:54:40 +0200
commit198aef7133713b47a4c4fadaac6811c9d3812d19 (patch)
tree84df335dd0ad350c20f8c2a018b2a7096907b636 /src/login/login.c
parent6977d6d31b58afc5095c0a59e754f21ea1080054 (diff)
parent8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff)
downloadhercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.gz
hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.bz2
hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.xz
hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/login/login.c')
-rw-r--r--src/login/login.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/login/login.c b/src/login/login.c
index 1d8ef489a..3ec60f0aa 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -15,7 +15,7 @@
#include "common/conf.h"
#include "common/core.h"
#include "common/db.h"
-#include "common/malloc.h"
+#include "common/memmgr.h"
#include "common/md5calc.h"
#include "common/nullpo.h"
#include "common/random.h"