]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b40665 6e77a70)
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)
Conflicts:

lib/autoconf.cfg

Will solve manually in a moment.


Trivial merge
UCW libraries