svn merge ^/branches/released

1 files changed, 58 insertions, 0 deletions

diff --git a/libX11/ChangeLog b/libX11/ChangeLog
index 4c74e7fc1..d537dd8db 100644
--- a/libX11/ChangeLog
+++ b/libX11/ChangeLog
@@ -1,3 +1,61 @@
+commit aad10032651cdc2a53b359035954454a28d6db67
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 23 13:55:14 2009 -0700
+
+    libX11 1.3.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 6303ada89cb228c0f9656036f798703afb42fc29
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Oct 21 12:42:07 2009 +1000
+
+    Add smiley faces to compose sequences.
+    
+    I wonder how we could have lasted that long without them.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Acked-by: Daniel Stone <daniel@fooishbar.org>
+    Acked-By: James Cloos <cloos@jhcloos.com>
+
+commit 0e104ebd8628803c27e36b16922ad1edd891325a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Oct 22 23:12:30 2009 -0700
+
+    Add man page for Compose file format
+    
+    Based on grammar description in modules/im/ximcp/imLcPrs.c and
+    note on XFree86 changes formerly found in xorg-docs RELNOTES.sgml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 9c95f2af7c442b3a59b1a30cf804f1ef4e7fc5b5
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 20 12:46:03 2009 -0700
+
+    Add extra configuration and sanity checks for groff and ps2pdf
+    
+    1) Add AC_ARG_VAR for GROFF and PS2PDF to inform users of these
+       environment variables.
+    2) Check that groff -ms works
+    
+    Some distributions ship the ms macros as a separate package which may
+    not be installed together with groff, so we need to make sure that groff
+    works and the required macros are actually installed before attempting
+    to build the specs.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit d3f801fd2f9198eaad6797414dba652f9c006c6d
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Sun Oct 18 17:34:53 2009 -0500
+
+    Fix VPATH build of libX11 specs
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
 commit ad15e1a89d30ccc11d80745897b83def1448e8c0
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Sat Oct 17 16:14:34 2009 -0700