xkbcomp: Changes to 'master'

[Peter Hutterer]

 man/xkbcomp.man |   12 ++++++++++++
 utils.h         |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit c66de126ad10a7220ab74e52fb7cc81b6d8b0993
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 21 15:19:35 2013 +1000

    man: document -help/-?, -em1, -emp, -eml
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit a4ff0f0eee046be846cc0f46edaba48b765e50d3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Apr 9 11:29:15 2013 +1000

    Use DEBUG, not DEBUG_ON to determine whether debugging is enabled
    
    Nothing else looks at DEBUG_ON.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>