xrdb: Changes to 'master'

[Alan Coopersmith]

 xrdb.c | 1534 +++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 800 insertions(+), 734 deletions(-)

New commits:
commit b21b44b214e9f4728665fcfd13da6e43ee93069a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 24 00:11:47 2015 -0700

    Fix "editting" typo in comment
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 843b15fc3c3be5effef78fe6b5abaa11788f0908
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 24 00:09:18 2015 -0700

    Reformat code to X.Org standard coding style
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>