Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 11 Aug 2012 21:56:01 +0000 (14:56 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 11 Aug 2012 21:56:01 +0000 (14:56 -0700)
commite1648a68d2a340848f1c8ec7bd695c6285927392
tree4581fdbdb801b9a9444abaefe64dbd72a845737a
parent1a34728c11e151b7dd897784899b5a763b3b8fe8
parentd6a023778e09222606cf6078767ddf14b2b84a0a
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2
sbin/dhclient/dhclient.c
sbin/hammer2/cmd_service.c
sbin/hammer2/hammer2.h
sbin/hammer2/msg.c
sbin/hammer2/msg_lnk.c