From: Robert Spalek <robert@ucw.cz>
Date: Sun, 23 Apr 2006 20:33:45 +0000 (+0200)
Subject: Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git
X-Git-Tag: holmes-import~645^2~11^2~60
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b9faa11fb24cc2d4d4b1b47f54b9c445fd070a21;p=libucw.git

Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git
---

b9faa11fb24cc2d4d4b1b47f54b9c445fd070a21
diff --cc lib/Makefile
index 39885a9f,8555ad27..e4126c7f
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -9,9 -9,9 +9,9 @@@ endi
  LIBUCW_MODS= \
  	alloc alloc_str realloc mempool mempool-str mempool-fmt \
  	mmap pagecache partmap hashfunc \
- 	lists slists sorter bitsig kmp \
+ 	lists slists sorter bitsig \
  	log log-file proctitle \
 -	conf ipaccess \
 +	conf conf2 ipaccess \
  	profile \
  	fastbuf ff-printf ff-utf8 \
  	fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow \