]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-lib
authorMartin Mares <mj@ucw.cz>
Sun, 16 Nov 2008 19:36:39 +0000 (20:36 +0100)
committerMartin Mares <mj@ucw.cz>
Sun, 16 Nov 2008 19:36:39 +0000 (20:36 +0100)
commita4fe009d3366b0a3e119713b0ecc7fc0070efdfa
treed778d5b0bed675cd69a3bb82ea2b82b72c69cac5
parent2b40665c6db79a95e3ee87a2aa255c3989cc776f
parent6e77a70a3d278c36deed5a774ac5c4830c6524e5
Merge branch 'master' into dev-lib

Conflicts:

lib/autoconf.cfg

Will solve manually in a moment.