xrdb: Changes to 'master'

[Alan Coopersmith]

 man/xrdb.man |    4 ++++
 xrdb.c       |   30 +++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 4e49a64191d3b08044d29d32896e15013e5e7540
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Jul 19 19:51:09 2013 -0700

    Add -version flag to print package version string from autoconf
    
    Also adds missing entry for -help flag to usage message.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-By: Matt Dew <marcoz at osource.org>

commit ec7b273fd135a14a2ca6c19cd0e6afe1536db552
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Jul 19 19:31:04 2013 -0700

    Only add -P flag if using cpp as our preprocessor
    
    Restores ability to use m4 (broken in xrdb-1.0.8 by commit 117021570515f)
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=34546
    
    Reviewed-by: <wharms at bfs.de>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>