]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac2282merge'
authorJINMEI Tatuya <jinmei@isc.org>
Wed, 26 Sep 2012 18:03:47 +0000 (11:03 -0700)
committerJINMEI Tatuya <jinmei@isc.org>
Wed, 26 Sep 2012 18:03:47 +0000 (11:03 -0700)
1  2 
configure.ac
src/lib/datasrc/Makefile.am
src/lib/datasrc/tests/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge
Simple merge