summaryrefslogtreecommitdiff
path: root/src/i830_dri.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:35:55 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:35:55 +0000
commit41eba03d0d62fe03a7b437c9c4914016c3125141 (patch)
tree9b74e1bc450726c2cb7c2abadec6d2662b7f406c /src/i830_dri.c
parente27494f2a9262b6310c2f1e0a40c406f578fc693 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/i830_dri.c')
-rw-r--r--src/i830_dri.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 37e1d1d6..4c9b1a28 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.16 2003/09/28 20:15:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c,v 1.15 2003/06/18 13:14:17 dawes Exp $ */
/**************************************************************************
Copyright 2001 VA Linux Systems Inc., Fremont, California.