diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
| commit | 3d353f31ac1671d1b39c09b1f8d82c8811d3edd6 (patch) | |
| tree | ce19dbcec75ce7e87547f6f9b3495888aaea0966 /xorg-server/dix/globals.c | |
| parent | b2a0f04a2984b290c1224fc1b1883d08b01a6231 (diff) | |
| parent | e67b35e7a899da5805fcce3d390cb10ebcaffe91 (diff) | |
| download | vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.gz vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.bz2 vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/dix/globals.c')
| -rw-r--r-- | xorg-server/dix/globals.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/dix/globals.c b/xorg-server/dix/globals.c index a564575f3..332b91f5c 100644 --- a/xorg-server/dix/globals.c +++ b/xorg-server/dix/globals.c @@ -128,6 +128,7 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; char *display; +int displayfd; char *ConnectionInfo; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; |