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 /hw/xnest/XNPixmap.h | |
| parent | c0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff) | |
| parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'hw/xnest/XNPixmap.h')
| -rw-r--r-- | hw/xnest/XNPixmap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index fab1843d1..77cba24af 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H |