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/mi/miinitext.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/mi/miinitext.c')
| -rw-r--r-- | xorg-server/mi/miinitext.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 778e77734..29903973f 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -389,9 +389,7 @@ InitExtensions(int argc, char *argv[]) if (!noGEExtension) GEExtensionInit(); #ifdef PANORAMIX -# if !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); -# endif #endif #ifdef INXQUARTZ if(!noPseudoramiXExtension) PseudoramiXExtensionInit(); |