libX11: Changes to 'master'

[Brice Goglin]

 man/XSetCommand.man       |    2 +-
 man/XrmMergeDatabases.man |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1a18319b3bde08dd9ef69c7cd735a76000cf3177
Author: Brice Goglin <Brice.Goglin at ens-lyon.org>
Date:   Thu Jul 26 23:31:15 2007 +0200

    Add missing override parameter in XrmCombineDatabase prototype in the manpage
    
    Reported by Arnaud Giersch <arnaud.giersch at iut-bm.univ-fcomte.fr>
    in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=393434
    and https://bugs.freedesktop.org/show_bug.cgi?id=9948
    
    Also add the type of the second argument in XrmMergeDatabases.

commit 6f0764d4b56f64786b4980839ca262f10a51af6f
Author: Brice Goglin <Brice.Goglin at ens-lyon.org>
Date:   Thu Jul 26 22:53:52 2007 +0200

    Clarify return value of XGetCommand in case of error in the manpage
    
    Reported by Sean Perry <shalehperry at attbi.com>
    in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133348
    and https://bugs.freedesktop.org/show_bug.cgi?id=9828