Nick Mathewson 2e6a985003 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

2012-11-01 18:12:07 -04:00

..

dns-example.c

Merge remote-tracking branch 'origin/patches-2.0'

2012-05-02 17:12:23 -04:00

event-read-fifo.c

Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation

2012-11-01 18:12:07 -04:00

hello-world.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

http-server.c

Fix some warnings found cross-compiling with mingw32

2012-11-01 18:05:27 -04:00

include.am

Rename subordinate Makefile.ams to include.am

2012-08-28 16:01:14 -04:00

le-proxy.c

Use "_WIN32", not WIN32: it's standard and we don't need to fake it

2011-05-25 20:03:15 -04:00

signal-test.c

Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation

2012-11-01 18:12:07 -04:00

time-test.c

Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation

2012-11-01 18:12:07 -04:00