]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/pr/36' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:43:49 +0000 (13:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:43:49 +0000 (13:43 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge