]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Apr 2012 13:52:40 +0000 (09:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Apr 2012 13:52:40 +0000 (09:52 -0400)
1  2 
configure.in

diff --cc configure.in
Simple merge