X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=NEWS;h=f1c2d2cae99c7a13e7c8854b70e3540426ccbabe;hb=9a8af404ffbfb331575dc4b37b044d49d728be8b;hp=6ee0a2466cda9afd7815b137ac7af7fdba557a22;hpb=06f5d6b7432d639ff3721d56f2c89b7d5b6cb963;p=ppastats.git

diff --git a/NEWS b/NEWS
index 6ee0a24..f1c2d2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,16 @@
+v1.1.0
+------
+
+* Fixed uninitialized struct fields bug leading to random errors.
+* Improved performance (keep track of the ddts older than 4 weeks).
+
 v1.0.0
 ------
 
 * new design for HTML pages.
 * fixed compilation issue with old json lib releases using
   boolean type and not defining json_bool.
-
-<<<<<<< .mine
-v0.0.9
-------
-
-=======
->>>>>>> .r1676
-* Fixed compilation issue related to 'boolean' type.
+* fixed compilation with libjson-c-dev debian package.
 
 v0.0.8
 ------