xdpyinfo: Changes to 'master'

[Alan Coopersmith]

 xdpyinfo.c |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 73cd9d89408ef08b7bbe4f3fb0ae94517441b045
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Nov 26 22:31:41 2013 -0800

    Sprinkle consts in StrCmp to quiet cast warnings
    
    Makes gcc stop saying:
    xdpyinfo.c: In function ‘StrCmp’:
    xdpyinfo.c:162:20: warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual]
    xdpyinfo.c:162:39: warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit ca6adf351b4fc317c4dfc4c8e723b84fd676d4e2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Nov 26 22:30:18 2013 -0800

    Print which option was in error along with usage message
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>