aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winprocarg.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-11 12:31:56 +0000
committermarha <marha@users.sourceforge.net>2009-09-11 12:31:56 +0000
commitde33a8e7273592eefd303a94e87a8b38592099a1 (patch)
tree6d3dd0379c8dae67fd57478239dce282d997ec05 /xorg-server/hw/xwin/winprocarg.c
parentb8d02796c52d4cedbacb49099edf9e59970276f7 (diff)
downloadvcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.tar.gz
vcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.tar.bz2
vcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.zip
- Removed waiting until clipboard was started after being launched in
function winProcSetSelectionOwner. (This was causing a dead lock) - Changed welcome message - Synchronised winclipboardxevents with the version on the release branch (Removed calls to XLockDisplay and XUnlockDisplay) - Call to XInitThreads has been moved to the beginning of dix\main. This function should be called before any call to a Xlib function.
Diffstat (limited to 'xorg-server/hw/xwin/winprocarg.c')
-rw-r--r--xorg-server/hw/xwin/winprocarg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 69d6ab7ac..305a82118 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -1537,7 +1537,7 @@ winLogVersionInfo (void)
return;
s_fBeenHere = TRUE;
- ErrorF ("Welcome to the XWin X Server\n");
+ ErrorF ("Welcome to the VcXsrv X Server\n");
ErrorF ("Vendor: %s\n", VENDOR_STRING);
ErrorF ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
ErrorF ("Contact: %s\n\n", VENDOR_CONTACT);