]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65c920c 296d29a)
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Sep 2011 15:11:30 +0000 (11:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Sep 2011 15:11:30 +0000 (11:11 -0400)
1  2 
event.c patch | diff1 | diff2 | blob | history

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