]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'mistotebe/bufferevent_trigger'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Dec 2013 15:33:58 +0000 (10:33 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Dec 2013 15:33:58 +0000 (10:33 -0500)
1  2 
include/event2/bufferevent.h
include/event2/event.h

Simple merge
Simple merge