]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f33e97a b7da638)
[master] Merge branch 'trac3382'
authorThomas Markwalder <tmark@isc.org>
Wed, 21 May 2014 18:32:09 +0000 (14:32 -0400)
committerThomas Markwalder <tmark@isc.org>
Wed, 21 May 2014 18:32:09 +0000 (14:32 -0400)
Fixed Conflicts in:
src/bin/d2/tests/nc_test_utils.cc
src/lib/dns/tests/labelsequence_unittest.cc

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

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