]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-opt
authorMartin Mares <mj@ucw.cz>
Tue, 14 Jan 2014 11:11:58 +0000 (12:11 +0100)
committerMartin Mares <mj@ucw.cz>
Tue, 14 Jan 2014 11:11:58 +0000 (12:11 +0100)
commit0192d9f3a127c82b32131d26ed9b5fb5a90db723
tree4e8ed350b2a23539fbf4d389d0799b183c472bb8
parent4d8858ba28597c458bef262399b553e5da89442a
parent2f022a488e18b369820934c2ba54525e0c4469ee
Merge branch 'master' into dev-opt

Conflicts:
ucw/Makefile
ucw/Makefile
ucw/conf-internal.h