]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 3 May 2011 18:29:44 +0000 (14:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 May 2011 18:29:44 +0000 (14:29 -0400)
1  2 
kqueue.c

diff --cc kqueue.c
Simple merge