]> granicus.if.org Git - libevent/commitdiff
Merge branch '21_event_callback_v3'
authorNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 15:36:52 +0000 (11:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 15:36:52 +0000 (11:36 -0400)
1  2 
include/event2/bufferevent.h
include/event2/event.h

Simple merge
Simple merge