]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4314a56 a2d03ca)
[github40] --with-dhcp-XXX renamed to --with-XXX
authorTomek Mrugalski <tomasz@isc.org>
Tue, 6 Feb 2018 17:17:23 +0000 (17:17 +0000)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 6 Feb 2018 17:17:23 +0000 (17:17 +0000)
Merge branch 'with-dhcp' of https://github.com/andreipavelQ/kea into github40

# Conflicts:
# doc/guide/install.xml

1  2 
configure.ac patch | diff1 | diff2 | blob | history
doc/guide/install.xml patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc doc/guide/install.xml
Simple merge
Mirror of https://github.com/isc-projects/kea.git