]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 22 Jan 2014 16:46:52 +0000 (11:46 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 22 Jan 2014 16:46:52 +0000 (11:46 -0500)
1  2 
epoll_sub.c

diff --cc epoll_sub.c
Simple merge