xinit: Changes to 'master'

[Jeremy Huddleston]

 startx.cpp |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

New commits:
commit ec55c94dfe1bf43ece808d984c672602faddd91b
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Nov 8 14:14:19 2011 -0800

    Use default clientargs, serverargs, and display if none were set
    
    Previously, we did not use the default values unless server or client weren't
    set, but we should still use the defaults if they were not set but the server
    was.  This is most evident when you want to tell startx which server to use,
    but you want startx to figure out which display to use automatically.
    
    This fixes a regression introduced by the previous patch on XQuartz:
    http://xquartz.macosforge.org/trac/ticket/523
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>