]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-os1:/home/hart/ntp-dev-libevent-upstream
authorDave Hart <hart@ntp.org>
Fri, 15 Apr 2011 11:38:17 +0000 (11:38 +0000)
committerDave Hart <hart@ntp.org>
Fri, 15 Apr 2011 11:38:17 +0000 (11:38 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libevent-20110415

bk: 4da82e29cQ0z90cSg4k6XSxH8oV09Q

1  2 
sntp/libevent/sample/http-server.c

Simple merge