diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-08-20 10:54:07 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-08-20 10:54:07 +0100 |
| commit | 9e7b29987fb6370333f4da2d4b91912fd8a29fb9 (patch) | |
| tree | f0ea188ff394fe7f0f7ebdf571594e3e9174d166 /include/opaque.h | |
| parent | 2846c3868a71d079c98cf05a9bb750791981f1bf (diff) | |
| parent | bc4cef1d0ae7cbb8f5fe16d576db45abd4330370 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2glucose-2
Conflicts:
configure.ac
glx/glxcmds.c
hw/xfree86/Makefile.am
hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
Diffstat (limited to 'include/opaque.h')
| -rw-r--r-- | include/opaque.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/opaque.h b/include/opaque.h index d5abcbd50..ab39cc8d0 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -54,7 +54,6 @@ extern char *display; extern int defaultBackingStore; extern Bool disableBackingStore; extern Bool enableBackingStore; -extern Bool disableSaveUnders; extern Bool PartialNetwork; #ifndef NOLOGOHACK extern int logoScreenSaver; |