]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28084d 4b8f02f)
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sat, 12 Mar 2011 17:12:35 +0000 (12:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 12 Mar 2011 17:12:35 +0000 (12:12 -0500)
1  2 
evrpc.c patch | diff1 | diff2 | blob | history

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