Merge branch 'master' into XACE-SELINUX

Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
This commit is contained in:
Eamon Walsh 2007-11-19 18:10:46 -05:00 • committed by Eamon Walsh
commit 2d17f47cc7
46 changed files with 92 additions and 977 deletions

View file

@ -166,6 +166,8 @@ RRModesForScreen (ScreenPtr pScreen, int *num_ret)
int num_screen_modes = 0;
screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
if (!screen_modes)
return NULL;
/*
* Add modes from all outputs