]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b70286 e06206e)
Merge remote-tracking branch 'github/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 May 2012 16:21:57 +0000 (12:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 May 2012 16:21:57 +0000 (12:21 -0400)
Conflicts:
test/regress.c

1  2 
test/regress.h patch | diff1 | diff2 | blob | history

diff --cc test/regress.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.