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

[meshlink] / NEWS

diff --git a/NEWS b/NEWS
index 792a71f1655badfe831522e64a6fb8beb28136d2..c48a0e80775073fc6e0a12d0dfbbd77f13465cda 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               May  8 2011
 
  * Fixed reading configuration files that do not end with a newline. Again.