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 /x11perf.h | |
| 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 'x11perf.h')
| -rw-r--r-- | x11perf.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.6 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.4 2001/07/25 15:05:16 dawes Exp $ */ #ifndef VMS #include <X11/Xlib.h> |