summaryrefslogtreecommitdiff
path: root/src/i810_video.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/i810_video.c
parente27494f2a9262b6310c2f1e0a40c406f578fc693 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/i810_video.c')
-rw-r--r--src/i810_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i810_video.c b/src/i810_video.c
index 6bd3e134..8d2bdc9a 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -23,7 +23,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_video.c,v 1.27 2003/11/11 00:58:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_video.c,v 1.26 2003/11/10 18:22:22 tsi Exp $ */
/*
* i810_video.c: i810 Xv driver. Based on the mga Xv driver by Mark Vojkovich.