]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Dec 2013 18:37:39 +0000 (13:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Dec 2013 18:37:39 +0000 (13:37 -0500)
1  2 
include/event2/bufferevent.h
include/event2/event.h

Simple merge
Simple merge