]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3113'
authorStephen Morris <stephen@isc.org>
Tue, 1 Oct 2013 13:16:40 +0000 (14:16 +0100)
committerStephen Morris <stephen@isc.org>
Tue, 1 Oct 2013 13:16:40 +0000 (14:16 +0100)
1  2 
configure.ac
src/lib/asiodns/Makefile.am
src/lib/hooks/Makefile.am
src/lib/resolve/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge