]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95e2455 c94a5f2)
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Jan 2012 22:18:52 +0000 (17:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Jan 2012 22:18:52 +0000 (17:18 -0500)
1  2 
evthread.c patch | diff1 | diff2 | blob | history

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