]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2011 04:35:35 +0000 (00:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2011 04:35:35 +0000 (00:35 -0400)
1  2 
select.c

diff --cc select.c
Simple merge