]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ec46c0 74760f1)
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 23 May 2011 21:50:45 +0000 (17:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 May 2011 21:50:45 +0000 (17:50 -0400)
1  2 
evdns.c patch | diff1 | diff2 | blob | history

diff --cc evdns.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.