Nick Mathewson 539466e568 Merge remote-tracking branch 'origin/patches-2.0' ...

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in

2012-02-10 17:33:50 -05:00

..

event2

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

2012-02-10 17:33:50 -05:00

evconfig-private.h

Prefer the ./configure evconfig-private.h in MinGW, just in case.

2011-01-03 15:44:26 -07:00

tree.h

Clean up formatting: remove trailing spaces

2010-02-18 17:46:56 -05:00