diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
| commit | 0b729051c04da7068f1e6dd319190bd0a362b2c0 (patch) | |
| tree | 6e15c5de67a40d04167fcf0a2e0e26af8eca11c2 /hw/darwin/bundle/startXClients.cpp | |
| parent | b7ee005d327372c1e414ee6c526f9f7aee14bc86 (diff) | |
| parent | d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
Diffstat (limited to 'hw/darwin/bundle/startXClients.cpp')
| -rw-r--r-- | hw/darwin/bundle/startXClients.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp index 51cdb5c9e..f812dbfd8 100644 --- a/hw/darwin/bundle/startXClients.cpp +++ b/hw/darwin/bundle/startXClients.cpp @@ -2,8 +2,6 @@ XCOMM!/bin/sh XCOMM This script is used by XDarwin to start X clients when XDarwin is XCOMM launched from the Finder. -XCOMM -XCOMM $XFree86: $ userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc |