Merge remote branch 'vignatti/for-keith'

Conflicts:
	exa/exa.c

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2010-04-21 16:07:38 -07:00
commit 7ac6a6b7d0
25 changed files with 39 additions and 3756 deletions

View file

@ -69,10 +69,6 @@ extern _X_EXPORT Bool noScreenSaverExtension;
extern _X_EXPORT Bool noMITShmExtension;
#endif
#ifdef MULTIBUFFER
extern _X_EXPORT Bool noMultibufferExtension;
#endif
#ifdef RANDR
extern _X_EXPORT Bool noRRExtension;
#endif