]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 16:09:18 +0000 (12:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 16:09:18 +0000 (12:09 -0400)
1  2 
select.c

diff --cc select.c
Simple merge