xrandr: Changes to 'master'

[Alan Coopersmith]

 xrandr.c |  114 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

New commits:
commit 0e0b47341a45c138082d9f8047dcbdb91b90155d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 13 00:11:41 2013 -0700

    Combine usage message strings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 38772ec3b5a7216a88676f95b5edc764dd0a23d6
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 13 00:07:26 2013 -0700

    Declare capability_name() as returning const char *
    
    Only used as an argument to printf.   Clears gcc warnings:
    xrandr.c: In function ‘capability_name’:
    xrandr.c:237:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
    xrandr.c:239:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
    xrandr.c:241:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
    xrandr.c:243:2: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
    xrandr.c:245:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>