fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 06:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'server-1.4-branch' into xorg-server-1.4-apple

Browse source
This commit is contained in:
Jeremy Huddleston 2008-05-14 00:33:17 -07:00
commit 3251fb54cd
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/kdrive/src/kdrive.c
View file

@ -1387,12 +1387,6 @@ KdInitOutput (ScreenInfo *pScreenInfo,
KdCardInfo *card;
KdScreenInfo *screen;
#ifdef COMPOSITE
/* kind of a hack: we want Composite enabled, but it's disabled per
* default. */
noCompositeExtension = FALSE;
#endif
if (!kdCardInfo)
{
InitCard (0);

2
xkb/ddxLoad.c
View file

@ -525,7 +525,7 @@ XkbRF_RulesPtr rules;
file = fopen(buf, "r");
if (!file) {
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file);
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
return False;
}