]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Apr 2011 21:22:36 +0000 (17:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Apr 2011 21:22:36 +0000 (17:22 -0400)
1  2 
evutil.c

diff --cc evutil.c
Simple merge