]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'dev-api' into dev-package
authorPavel Charvat <pchar@ucw.cz>
Tue, 7 Jan 2014 09:11:17 +0000 (10:11 +0100)
committerPavel Charvat <pchar@ucw.cz>
Tue, 7 Jan 2014 09:11:17 +0000 (10:11 +0100)
commita4f8b029b86d2ca1612a9c2e2795ccea27b15276
tree6d0a00a101ffce1736af8973b141d25d3e90fc7e
parent0c576082142e5a560c776034b651bf795598983f
parent863b12ae48459fc7450cd09686588ada98649fdc
Merge branch 'dev-api' into dev-package

Conflicts:
default.cfg
debug/check-configs
debug/default.cfg
default.cfg
ucw/daemon.h
ucw/default.cfg