summaryrefslogtreecommitdiff
path: root/src/common/Makefile.in
diff options
context:
space:
mode:
authorblacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-10 16:04:24 +0000
committerblacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-10 16:04:24 +0000
commite85c28ce148e0740697c76e9751b0d9cacbe67d1 (patch)
tree8ca92b709d2606a738e911eaaf9605efadc0c79e /src/common/Makefile.in
parent76ed57676c0ed81a433f45c4350b5b5fcba11a7d (diff)
downloadhercules-e85c28ce148e0740697c76e9751b0d9cacbe67d1.tar.gz
hercules-e85c28ce148e0740697c76e9751b0d9cacbe67d1.tar.bz2
hercules-e85c28ce148e0740697c76e9751b0d9cacbe67d1.tar.xz
hercules-e85c28ce148e0740697c76e9751b0d9cacbe67d1.zip
- added some missing copyrights
- merged (bs-coreoptimize->trunk) generic athena style configuration parser (raconf) - merged (bs-coreoptimize->trunk) threadsafe memory pool (mempool) [i need it for the new 'socket' system] - set svn:eol-style property on newer files were it was missing git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16263 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/Makefile.in')
-rw-r--r--src/common/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 3f03982d7..b6713b6a1 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -3,7 +3,7 @@ COMMON_OBJ = obj_all/core.o obj_all/socket.o obj_all/timer.o obj_all/db.o obj_al
obj_all/nullpo.o obj_all/malloc.o obj_all/showmsg.o obj_all/strlib.o obj_all/utils.o \
obj_all/grfio.o obj_all/mapindex.o obj_all/ers.o obj_all/md5calc.o \
obj_all/minicore.o obj_all/minisocket.o obj_all/minimalloc.o obj_all/random.o obj_all/des.o \
- obj_all/conf.o obj_all/thread.o obj_all/mutex.o
+ obj_all/conf.o obj_all/thread.o obj_all/mutex.o obj_all/raconf.o obj_all/mempool.o
COMMON_H = $(shell ls ../common/*.h)