diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
commit | 9231a3312bb099559fb6902f8641a4f331fc4ce5 (patch) | |
tree | 548fe3e553806436099c3d37028bee2e2a25cbc2 /x11pcomp.cpp | |
parent | 9b69c93543a87fe6cbf6416944d0d3fbab2fe4b4 (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-BASE
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).
Diffstat (limited to 'x11pcomp.cpp')
-rw-r--r-- | x11pcomp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x11pcomp.cpp b/x11pcomp.cpp index 2fa5b38..dd0309e 100644 --- a/x11pcomp.cpp +++ b/x11pcomp.cpp @@ -1,6 +1,6 @@ XCOMM! /bin/sh XCOMM -XCOMM $XFree86: xc/programs/x11perf/x11pcomp.cpp,v 1.5 2002/11/25 14:05:05 eich Exp $ +XCOMM $XFree86$ XCOMM XCOMM Collects multiple outputs of x11perf. Just feed it a list of files, each XCOMM containing the output from an x11perf run, and this shell will extract the |