Merge remote-tracking branch 'sourceforge/patches-2.0' into patches-2.0

Conflicts:
	include/event2/event.h
This commit is contained in:
Nick Mathewson 2013-12-20 13:37:04 -05:00
commit eaa79cd459

View File

@ -645,7 +645,7 @@ int event_base_set(struct event_base *, struct event *);
This is a more flexible version of event_base_dispatch().
By default, this loop will run the event base until either there are no more
pending or active, or until something calls event_base_loopbreak() or
pending or active events, or until something calls event_base_loopbreak() or
event_base_loopexit(). You can override this behavior with the 'flags'
argument.