]> granicus.if.org Git - libevent/commitdiff
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Jan 2011 23:02:11 +0000 (18:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Jan 2011 23:02:11 +0000 (18:02 -0500)
1  2 
configure.in

diff --cc configure.in
Simple merge