Merge branch 'ifdef' of git://github.com/rosslagerwall/libevent
authorNick Mathewson <nickm@torproject.org>
Sat, 11 Feb 2012 04:52:27 +0000 (23:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 11 Feb 2012 04:52:27 +0000 (23:52 -0500)
1  2 
devpoll.c
epoll.c
evport.c
kqueue.c
poll.c
select.c

diff --cc devpoll.c
Simple merge
diff --cc epoll.c
Simple merge
diff --cc evport.c
Simple merge
diff --cc kqueue.c
Simple merge
diff --cc poll.c
Simple merge
diff --cc select.c
Simple merge