]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f71a0c6 1bf6cdf)
Merge branch 'master' into trac1704_2
authorMukund Sivaraman <muks@isc.org>
Sun, 3 Jun 2012 19:11:11 +0000 (00:41 +0530)
committerMukund Sivaraman <muks@isc.org>
Sun, 3 Jun 2012 19:11:11 +0000 (00:41 +0530)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/lib/util/tests/Makefile.am patch | diff1 | diff2 | blob | history

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