Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 08:11:53 +0000 (10:11 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 08:11:53 +0000 (10:11 +0200)
ChangeLog

index 551ee06..8cadc0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ================================================================================
+VERSION 1.1.2                                                         XX XX XXXX
+
+================================================================================
 VERSION 1.1.1                                                         09 05 2011
 
 New: