]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c779a4 320f960)
[2429] Merge remote-tracking branch 'origin/trac2428' into trac2429
authorJINMEI Tatuya <jinmei@isc.org>
Tue, 11 Dec 2012 21:06:19 +0000 (13:06 -0800)
committerJINMEI Tatuya <jinmei@isc.org>
Tue, 11 Dec 2012 21:06:19 +0000 (13:06 -0800)
resolving conflicts in:
src/lib/dns/master_loader.cc

1  2 
src/lib/dns/master_loader.cc patch | diff1 | diff2 | blob | history
src/lib/dns/tests/master_loader_unittest.cc patch | diff1 | diff2 | blob | history

diff --cc src/lib/dns/master_loader.cc
Simple merge
Mirror of https://github.com/isc-projects/kea.git