diff options
author | Keith Packard <keithp@keithp.com> | 2010-04-21 16:07:38 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-04-21 16:07:38 -0700 |
commit | 7ac6a6b7d0dfc5e021270b2898accd3425aa008a (patch) | |
tree | 5afdeb8b639763c349f1c9194091e0939e87b4ac /os | |
parent | 0782894b5702adcf6f4a90861793b717f3856fa5 (diff) | |
parent | f7ef6fd9a1a1f48603df2796fe7c904c25a81077 (diff) |
Merge remote branch 'vignatti/for-keith'
Conflicts:
exa/exa.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'os')
-rw-r--r-- | os/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/os/utils.c b/os/utils.c index e622e532d..7ab7cc3db 100644 --- a/os/utils.c +++ b/os/utils.c @@ -146,9 +146,6 @@ Bool noScreenSaverExtension = FALSE; #ifdef MITSHM Bool noMITShmExtension = FALSE; #endif -#ifdef MULTIBUFFER -Bool noMultibufferExtension = FALSE; -#endif #ifdef RANDR Bool noRRExtension = FALSE; #endif |