xinit: Changes to 'master'

Wed Mar 25 01:33:45 PDT 2015

 startx.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e07fa99039c0f63ed8f0b142e546ef102321fca0
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Mar 20 14:25:44 2015 +0100

    startx: Fix startx picking an already used display number when -nolock is used
    
    Currently startx relies on /tmp/.X?-lock being present for automatically
    picking a free display number. This does not work if -nolock is used when
    starting the server, or if the server is started with -displayfd as -displayfd
    implies -nolock.
    
    This is becoming a problem now that -displayfd is getting used by
    display-managers (e.g. gdm), this fixes this by also checking for
    /tmp/.X11-unix/X?
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>