diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:15 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:15 +0000 |
commit | 1cd6c395a0de67a2edae8264be2ae797884afb96 (patch) | |
tree | 5584df598701d3e352d0c9e1697e06cc3dc29629 | |
parent | c40bf536476e273517f52526f9451b3b5b88f32b (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | ico.c | 2 | ||||
-rw-r--r-- | ico.man | 2 | ||||
-rw-r--r-- | polyinfo.h | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/ico/ico.c,v 1.10 2003/05/27 22:26:56 tsi Exp $ */ +/* $XFree86: xc/programs/ico/ico.c,v 1.9tsi Exp $ */ /****************************************************************************** * Description @@ -1,5 +1,5 @@ .\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $ -.\" $XFree86: xc/programs/ico/ico.man,v 1.5 2003/05/29 21:48:10 herrb Exp $ +.\" $XFree86: xc/programs/ico/ico.man,v 1.4 2003/03/19 01:49:28 dawes Exp $ .TH ICO 1 __xorgversion__ .SH NAME ico \- animate an icosahedron or other polyhedron @@ -1,7 +1,7 @@ /* polyinfo.h * This is the description of one polyhedron file */ -/* $XFree86: xc/programs/ico/polyinfo.h,v 1.3 2000/02/17 14:00:32 dawes Exp $ */ +/* $XFree86$ */ #define MAXVERTS 120 /* great rhombicosidodecahedron has 120 vertices */ |