]> granicus.if.org Git - libevent/commit
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 04:00:45 +0000 (23:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 04:00:45 +0000 (23:00 -0500)
commit4560b31bdf1ed633518ebbdd0b3e11ffa1272cf5
tree0427a1fd4303db6d2d4a8040054b007ad1304f00
parentc53895944dfefd0f8586d2639d400e0ffe956562
parent5209fadfd07af3f3379ac607582c37933b33e044
Merge remote branch 'origin/patches-2.0'

Conflicts:
event-internal.h
event-internal.h
event.c