projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da45aa7 11f36a5)
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Dec 2011 16:02:12 +0000 (11:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Dec 2011 16:02:12 +0000 (11:02 -0500)
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.