]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26e85fc 7206e8c)
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Jan 2012 19:47:05 +0000 (14:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Jan 2012 19:47:05 +0000 (14:47 -0500)
1  2 
sample/http-server.c patch | diff1 | diff2 | blob | history

diff --cc sample/http-server.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.