]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Jun 2011 17:28:40 +0000 (13:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Jun 2011 17:28:40 +0000 (13:28 -0400)
1  2 
kqueue.c

diff --cc kqueue.c
Simple merge