Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am
This commit is contained in:
Guus Sliepen 2011-06-24 21:40:55 +02:00
commit 79e9a4f743
3 changed files with 10 additions and 4 deletions

8
NEWS
View file

@ -4,7 +4,13 @@ Version 1.1-cvs Work in progress
* Use splay trees instead of AVL trees.
* Fix ProcessPriority option under Windows.
Version 1.0.15 June 24 2011
* Improved logging to file.
* Reduced amount of process wakeups on platforms which support pselect().
* Fixed ProcessPriority option under Windows.
Version 1.0.14 May 8 2011