]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 15:06:11 +0000 (11:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 15:06:11 +0000 (11:06 -0400)
1  2 
Makefile.am
configure.in

diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge