]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10fa44e ed75a8d)
[master] Merge branch 'trac3339'
authorThomas Markwalder <tmark@isc.org>
Wed, 26 Feb 2014 11:30:57 +0000 (06:30 -0500)
committerThomas Markwalder <tmark@isc.org>
Wed, 26 Feb 2014 11:30:57 +0000 (06:30 -0500)
data::merge function now merges map sub elements.


Trivial merge
Mirror of https://github.com/isc-projects/kea.git