]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0901a0c 0bfc13f)
[master] Merge branch 'trac5075'
authorMarcin Siodelski <marcin@isc.org>
Mon, 19 Dec 2016 13:48:05 +0000 (14:48 +0100)
committerMarcin Siodelski <marcin@isc.org>
Mon, 19 Dec 2016 13:48:05 +0000 (14:48 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/bin/dhcp6/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/bin/dhcp6/Makefile.am
Simple merge
Mirror of https://github.com/isc-projects/kea.git