libX11: Changes to 'master'

[Egbert Eich]

 src/xcms/Makefile.am |    5 +++--
 src/xcms/cmsColNm.c  |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cd25cab4b5b957641183ce72dd1ae0424aff1663
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 18:27:02 2011 +0200

    Install Xcms.txt in $(datadir) rather than $(libdir).
    
    This file is an architecture independent data and should be where
    other databases are.
    This is the Xlib provided sample file, applications are free to
    use a different one specifying its location in the XCMSDB env
    variable.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 51fef7e273b5c6256e4c9604e3e1afe5dc8f6a1a
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri May 20 18:25:24 2011 +0200

    Don't hard code path to Xcms.txt file.
    
    The path to this file is configurable at build time. The source
    however contains a hard coded path.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>