diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
| commit | c2535f67923bde0bfb0e72363467110806e2f40f (patch) | |
| tree | 86e27df1edccb7318a378a25c1a74c212d10ce85 /dix/pixmap.c | |
| parent | c0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff) | |
| parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'dix/pixmap.c')
| -rw-r--r-- | dix/pixmap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dix/pixmap.c b/dix/pixmap.c index 1c3d49fc5..a5b7b064d 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: pixmap.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> |