From: Martin Mares <mj@ucw.cz>
Date: Thu, 30 Oct 2008 22:19:10 +0000 (+0100)
Subject: Merge branch 'dev-free' into dev-lib
X-Git-Tag: holmes-import~227^2~5
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ad920945145a18895ef391511c92ef42e0e4c3d7;p=libucw.git

Merge branch 'dev-free' into dev-lib

Conflicts:

	ucw/doc/Makefile
---

ad920945145a18895ef391511c92ef42e0e4c3d7
diff --cc ucw/doc/Makefile
index 71e002f9,61f18745..4c264d40
--- a/ucw/doc/Makefile
+++ b/ucw/doc/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  
  DIRS+=ucw/doc
  
- UCW_DOCS=fastbuf index basecode hash docsys conf mempool mainloop
 -UCW_DOCS=fastbuf index config configure install basecode hash docsys conf mempool
++UCW_DOCS=fastbuf index config configure install basecode hash docsys conf mempool mainloop
  UCW_INDEX=$(o)/ucw/doc/def_index.html
  UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))