Merge branch 'master' into 1.1

[tinc] / NEWS

diff --git a/NEWS b/NEWS
index 942398e..3b06596 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.12               Feb  3 2010
 
  * Really allow fast roaming of hosts to other nodes in a switched VPN.