From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 19 Nov 2011 14:32:39 +0000 (+0100)
Subject: Updates ChangeLog.
X-Git-Tag: xorg/1.1.5~93
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ffc8e1e900b62993eca10ff363705409030786b1;p=platal.git

Updates ChangeLog.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 72d426f..5e71629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 ================================================================================
 VERSION 1.1.5                                                         XX XX XXXX
 
+From 1.1.4 branch:
+
+    * XnetEvent:
+        - #1566: Corrects the total number in events                       -GLN
+        - #1567: Payment takes into account the amount when it is given    -GLN
+
 ================================================================================
 VERSION 1.1.4                                                         14 11 2011