]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Nov 2012 22:12:07 +0000 (18:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Nov 2012 22:12:07 +0000 (18:12 -0400)
commit2e6a985003cbe10921eef9036c2a7ba5cee5d683
tree4c1a6108bc8672c17f5b77a5b21aeab200ea4c03
parent6810908a5fd7d38a5aaec7cceae5a12b372c53c3
parent94866c2763c51d11354437b48d05c19306e220a9
Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation

Conflicts:
event.c
http.c
sample/event-read-fifo.c
test/regress_bufferevent.c
20 files changed:
event.c
http.c
sample/event-read-fifo.c
sample/signal-test.c
sample/time-test.c
test/bench.c
test/bench_cascade.c
test/regress_bufferevent.c
test/regress_dns.c
test/regress_main.c
test/regress_ssl.c
test/regress_util.c
test/regress_zlib.c
test/test-changelist.c
test/test-eof.c
test/test-init.c
test/test-ratelim.c
test/test-time.c
test/test-weof.c
util-internal.h