]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d5399c 3359259)
Merge remote-tracking branch 'origin/trac1976-cont-3' into work/merge
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 24 Jul 2012 09:02:07 +0000 (11:02 +0200)
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>
Tue, 24 Jul 2012 09:02:07 +0000 (11:02 +0200)
1  2 
src/bin/auth/main.cc patch | diff1 | diff2 | blob | history

diff --cc src/bin/auth/main.cc
Simple merge
Mirror of https://github.com/isc-projects/kea.git