setxkbmap: Changes to 'master'

[Peter Hutterer]

 setxkbmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f5ffd59830ff5f4a4f337d56e7e8b4a1930a46e8
Author: Stéphane Aulery <lkppo at free.fr>
Date:   Tue Jul 2 00:06:55 2013 +0200

    Ensure consistency between the manpage and the output of the -h option
    
    This is in addition to the correction [1] for bug #524510 reported by Debian [2].
    
    [1] http://cgit.freedesktop.org/xorg/app/setxkbmap/commit/?id=2011f509c56b73cc62105c689d702f279f522017
    
    [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524510
    
    Signed-off-by: Stéphane Aulery <lkppo at free.fr>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>