]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'github/21_fast_syscalls'
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Feb 2012 02:07:44 +0000 (21:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Feb 2012 02:07:44 +0000 (21:07 -0500)
1  2 
bufferevent_sock.c
configure.in
epoll.c
evdns.c
event.c
evutil.c
http.c
listener.c
signal.c
util-internal.h

Simple merge
diff --cc configure.in
Simple merge
diff --cc epoll.c
Simple merge
diff --cc evdns.c
Simple merge
diff --cc event.c
Simple merge
diff --cc evutil.c
Simple merge
diff --cc http.c
Simple merge
diff --cc listener.c
Simple merge
diff --cc signal.c
Simple merge
diff --cc util-internal.h
Simple merge