Merge branch 'master' into 1.1

[tinc] / NEWS

diff --git a/NEWS b/NEWS
index b5ce496..cee37ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Version 1.1-cvs              Work in progress
+
+ * Use libevent to handle I/O events and timeouts.
+
+ * Use splay trees instead of AVL trees.
+
 Version 1.0.14               not released yet
 
  * Fixed reading configuration files that do not end with a newline. Again.