summaryrefslogtreecommitdiff
path: root/hw/xfree86/xaa/xaaBitmap.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-08-10 10:37:59 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2006-08-10 10:37:59 -0700
commitc2535f67923bde0bfb0e72363467110806e2f40f (patch)
tree86e27df1edccb7318a378a25c1a74c212d10ce85 /hw/xfree86/xaa/xaaBitmap.c
parentc0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff)
parentdb82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'hw/xfree86/xaa/xaaBitmap.c')
-rw-r--r--hw/xfree86/xaa/xaaBitmap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c
index 940525927..f7ae78d3f 100644
--- a/hw/xfree86/xaa/xaaBitmap.c
+++ b/hw/xfree86/xaa/xaaBitmap.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */
#ifdef HAVE_XORG_CONFIG_H