From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 18 Sep 2006 19:03:21 +0000 (+0000)
Subject: merge
X-Git-Tag: xorg/0.9.12~277
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d5a28192bf0d9857f2476daec3bb932dc3428683;p=platal.git

merge



git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@853 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/ChangeLog b/ChangeLog
index a7017ee..58d98f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ================================================================================
-VERSION 0.9.11                                                      ?? ???? 2006
+VERSION 0.9.11                                                        18 09 2006
 
 New: