]> mj.ucw.cz Git - libucw.git/commit
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)
commitad920945145a18895ef391511c92ef42e0e4c3d7
tree654d7d890381738dcb9454c0eb2456b5f52ac2e8
parent2f7630dd5985ef6fa237d0c79f820fcf128a97e5
parentba7d341ccf72d0e29554802fc399a24ea3aaaa3a
Merge branch 'dev-free' into dev-lib

Conflicts:

ucw/doc/Makefile
ucw/doc/Makefile