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

[tinc] / NEWS

diff --git a/NEWS b/NEWS
index 4b2176e..44366cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
-Version 1.0.15               not released yet
+Version 1.1-cvs              Work in progress
 
- * Fix ProcessPriority option under Windows.
+ * Use libevent to handle I/O events and timeouts.
+
+ * Use splay trees instead of AVL trees.
+
+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