Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-07-21 19:05:41 -04:00 • committed by Daniel Stone
commit 7465010d59
1106 changed files with 3844 additions and 1744 deletions

View file

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.36 2006/06/01 18:47:01 daniels Exp $ */
/*
* Loosely based on code bearing the following copyright: