xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/bundle/X11.sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b62ed1f8eaf041a946bb591165bb18ee481dedbf
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Dec 18 09:14:16 2008 -0800

    XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells

diff --git a/hw/xquartz/bundle/X11.sh b/hw/xquartz/bundle/X11.sh
index 87c52b3..f6fac9f 100755
--- a/hw/xquartz/bundle/X11.sh
+++ b/hw/xquartz/bundle/X11.sh
@@ -1,3 +1,8 @@
 #!/bin/bash --login
 
-"$(dirname $0)"/X11.bin "${@}"
+if [ -x ~/.x11run ]; then
+	exec ~/.x11run "$(dirname $0)"/X11.bin "${@}"
+else
+	exec "$(dirname $0)"/X11.bin "${@}"
+fi
+