]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 541d685 84fc663)
Merge branch 'master' into v1_3_0
authorWlodek Wencel <wlodek@isc.org>
Tue, 24 Oct 2017 21:59:04 +0000 (23:59 +0200)
committerWlodek Wencel <wlodek@isc.org>
Tue, 24 Oct 2017 21:59:04 +0000 (23:59 +0200)
Conflicts:
configure.ac

1  2 
configure.ac patch | diff1 | diff2 | blob | history

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