Merge between X_3_9_16 and X_3_9_17 Compiles but may not run.
parent
bf0e55959f
commit
9243a76e03
|
@ -1,6 +1,6 @@
|
||||||
/* xf86drm.c -- User-level interface to DRM device
|
/* xf86drm.c -- User-level interface to DRM device
|
||||||
* Created: Tue Jan 5 08:16:21 1999 by faith@precisioninsight.com
|
* Created: Tue Jan 5 08:16:21 1999 by faith@precisioninsight.com
|
||||||
* Revised: Mon Dec 6 11:34:13 1999 by faith@precisioninsight.com
|
* Revised: Thu Jan 6 10:32:25 2000 by faith@precisioninsight.com
|
||||||
*
|
*
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||||
* All Rights Reserved.
|
* All Rights Reserved.
|
||||||
|
@ -24,8 +24,7 @@
|
||||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
* DEALINGS IN THE SOFTWARE.
|
* DEALINGS IN THE SOFTWARE.
|
||||||
*
|
*
|
||||||
* $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.43 1999/08/04 18:14:43 faith Exp $
|
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.6 1999/12/14 01:33:54 robin Exp $
|
||||||
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.5 1999/10/13 22:33:07 dawes Exp $
|
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue