diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-21 12:52:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-21 12:52:35 +0000 |
| commit | 7719409ebcf17c5288114dee8f60cc9ff889fd3e (patch) | |
| tree | e86379743c048712c638bed954264fccea7798c4 /xorg-server/hw/dmx/config/xdmxconfig.c | |
| parent | 26ee05a8febfe1ed6da852777a8c1c2a37e4cf9b (diff) | |
| parent | b0be6a88c8fecdf15176f642c0799bff99930e0d (diff) | |
| download | vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.tar.gz vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.tar.bz2 vcxsrv-7719409ebcf17c5288114dee8f60cc9ff889fd3e.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/config/xdmxconfig.c')
| -rw-r--r-- | xorg-server/hw/dmx/config/xdmxconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/dmx/config/xdmxconfig.c b/xorg-server/hw/dmx/config/xdmxconfig.c index 033b52512..c67077aec 100644 --- a/xorg-server/hw/dmx/config/xdmxconfig.c +++ b/xorg-server/hw/dmx/config/xdmxconfig.c @@ -142,7 +142,7 @@ static void dmxConfigGetDims(int *maxWidth, int *maxHeight) DMXConfigEntryPtr e; *maxWidth = dmxConfigWallWidth = 0; - *maxWidth = dmxConfigWallHeight = 0; + *maxHeight = dmxConfigWallHeight = 0; if (!dmxConfigCurrent) return; dmxConfigWallWidth = dmxConfigCurrent->width; |