]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2012 15:46:14 +0000 (11:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2012 15:46:14 +0000 (11:46 -0400)
commitf9182d7249562a2aa547135d2f15ffe3e03c77fa
treea5d9bf5726be236e483b3c2fd3e26cf5434410e1
parent56e48c1019abe21081fe344846106722acf46c8e
parent62bd2c44f114fdc66e5537eadb354d7629794932
Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation

Conflicts:
http.c
signal.c
http.c
signal.c
win32select.c