]> git.ipfire.org Git - thirdparty/dhcp.git/commit
[master] Merge branch 'rt25901_atf'
authorTomek Mrugalski <tomasz@isc.org>
Tue, 14 Aug 2012 13:20:46 +0000 (15:20 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 14 Aug 2012 13:20:46 +0000 (15:20 +0200)
commit85c8df6dd08d48a4bab5fdec6ea71c70e9bd9dc2
treeab009f3af64ad0e0dcd1c546e0b7ae277cfe26dd
parenta0497ac5ac9b787edebceaecb29da0c4e5e0b320
parent0b483f01af4288c4be28ee06ba254435c954716e
[master] Merge branch 'rt25901_atf'

Conflicts:
configure
configure.ac
includes/config.h.in
server/dhcpd.c
server/mdb6.c