]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7630d ba7d341)
Merge branch 'dev-free' into dev-lib
authorMartin Mares <mj@ucw.cz>
Thu, 30 Oct 2008 22:19:10 +0000 (23:19 +0100)
committerMartin Mares <mj@ucw.cz>
Thu, 30 Oct 2008 22:19:10 +0000 (23:19 +0100)
Conflicts:

ucw/doc/Makefile

1  2 
ucw/doc/Makefile patch | diff1 | diff2 | blob | history

diff --cc ucw/doc/Makefile
index 71e002f9586fe3f04dd074da5987e13983232117,61f18745344336432d05f23946408df9e2710564..4c264d40a7df7bb2141aa4fab668e3212bec4b04
--- 1/ucw/doc/Makefile
--- 2/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)))
  
UCW libraries