diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
| commit | 8e69b2fa996acf8fa1d218b67a203eb67e280899 (patch) | |
| tree | 1caebab7024f5b62dc57e49a69a20ef10cb8210f /xorg-server/os | |
| parent | cd103d3f4d59ac4f09cfcf126e572ddb0b9d4628 (diff) | |
| parent | f6d1847eef027266daa0f75ee92ceb09698b2761 (diff) | |
| download | vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.gz vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.bz2 vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/connection.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index ddda86a79..50ed4ae69 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -380,6 +380,7 @@ NotifyParentProcess(void) #if !defined(WIN32) if (dynamic_display[0]) { write(displayfd, dynamic_display, strlen(dynamic_display)); + write(displayfd, "\n", 1); close(displayfd); } if (RunFromSmartParent) { |