From 9231a3312bb099559fb6902f8641a4f331fc4ce5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:18 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- Xmark | 2 +- Xmark.man | 2 +- bitmaps.h | 2 +- do_arcs.c | 2 +- do_blt.c | 2 +- do_complex.c | 2 +- do_dots.c | 2 +- do_lines.c | 2 +- do_movewin.c | 2 +- do_rects.c | 2 +- do_segs.c | 2 +- do_simple.c | 2 +- do_tests.c | 2 +- do_text.c | 2 +- do_traps.c | 2 +- do_tris.c | 2 +- do_valgc.c | 2 +- do_windows.c | 2 +- x11pcomp.cpp | 2 +- x11perf.c | 2 +- x11perf.h | 2 +- x11perf.man | 2 +- x11perfcomp.man | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Xmark b/Xmark index 50056d3..dbe59e9 100644 --- a/Xmark +++ b/Xmark @@ -8,7 +8,7 @@ # Usage: Xmark datafile # ############################################################ -# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.3 2001/01/17 23:45:10 dawes Exp $ +# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.2 1997/01/04 12:20:20 dawes Exp $ # # # CHANGE HISTORY: diff --git a/Xmark.man b/Xmark.man index f9b5113..6e11021 100644 --- a/Xmark.man +++ b/Xmark.man @@ -1,6 +1,6 @@ .\" This manpage was written by Richard Braakman and is licensed under the .\" XFree86 license. -.\" $XFree86: xc/programs/x11perf/Xmark.man,v 1.3 2001/01/27 18:21:07 dawes Exp $ +.\" $XFree86: xc/programs/x11perf/Xmark.man,v 1.2 2001/01/24 00:06:42 dawes Exp $ .TH Xmark 1 __xorgversion__ .SH NAME Xmark \- summarize x11perf results diff --git a/bitmaps.h b/bitmaps.h index de5806d..5ffb431 100644 --- a/bitmaps.h +++ b/bitmaps.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.4 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */ /* Set fill style (if any) to a bitmap or tile */ diff --git a/do_arcs.c b/do_arcs.c index 9f2b422..c01085f 100644 --- a/do_arcs.c +++ b/do_arcs.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" diff --git a/do_blt.c b/do_blt.c index 541c61b..2d93255 100644 --- a/do_blt.c +++ b/do_blt.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.9 2001/11/03 21:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.8 2001/05/01 16:19:16 alanh Exp $ */ #include "x11perf.h" #include diff --git a/do_complex.c b/do_complex.c index faa073f..1886da9 100644 --- a/do_complex.c +++ b/do_complex.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.9 2002/05/31 18:46:09 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.8 2001/07/25 15:05:16 dawes Exp $ */ #include "x11perf.h" diff --git a/do_dots.c b/do_dots.c index aa6702b..26a429d 100644 --- a/do_dots.c +++ b/do_dots.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" diff --git a/do_lines.c b/do_lines.c index 95dd810..1469a0f 100644 --- a/do_lines.c +++ b/do_lines.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" diff --git a/do_movewin.c b/do_movewin.c index 06d1803..ed25d7f 100644 --- a/do_movewin.c +++ b/do_movewin.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" diff --git a/do_rects.c b/do_rects.c index 9c99f2b..65b8acb 100644 --- a/do_rects.c +++ b/do_rects.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */ #include "x11perf.h" #include "bitmaps.h" diff --git a/do_segs.c b/do_segs.c index 8606217..a1352d7 100644 --- a/do_segs.c +++ b/do_segs.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #include "x11perf.h" diff --git a/do_simple.c b/do_simple.c index 096cdcc..2852f7a 100644 --- a/do_simple.c +++ b/do_simple.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.7 2003/05/27 22:26:58 tsi Exp $ */ +/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.6tsi Exp $ */ #ifndef VMS #include diff --git a/do_tests.c b/do_tests.c index ad429b7..c23f1db 100644 --- a/do_tests.c +++ b/do_tests.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.10 2002/05/13 06:23:35 keithp Exp $ */ +/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.9 2002/05/13 05:27:37 keithp Exp $ */ #include "x11perf.h" diff --git a/do_text.c b/do_text.c index 23303ee..84763b2 100644 --- a/do_text.c +++ b/do_text.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_text.c,v 1.9 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/do_text.c,v 1.7 2001/01/17 23:45:12 dawes Exp $ */ #include "x11perf.h" #include diff --git a/do_traps.c b/do_traps.c index 9501563..c0f1551 100644 --- a/do_traps.c +++ b/do_traps.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.10 2003/05/27 22:26:58 tsi Exp $ */ +/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.9tsi Exp $ */ #include "x11perf.h" #include "bitmaps.h" diff --git a/do_tris.c b/do_tris.c index d8b0c3b..5507b6c 100644 --- a/do_tris.c +++ b/do_tris.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #undef POLYTRIANGLE_HACK /* don't use this code */ diff --git a/do_valgc.c b/do_valgc.c index 5d2b45d..533d3e2 100644 --- a/do_valgc.c +++ b/do_valgc.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #ifndef VMS #include diff --git a/do_windows.c b/do_windows.c index 954d1e6..f608063 100644 --- a/do_windows.c +++ b/do_windows.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */ #include "x11perf.h" 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 diff --git a/x11perf.c b/x11perf.c index 2cf11d4..ed6fb87 100644 --- a/x11perf.c +++ b/x11perf.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************************/ -/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.8 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */ #include #include diff --git a/x11perf.h b/x11perf.h index d2386ec..2a9f516 100644 --- a/x11perf.h +++ b/x11perf.h @@ -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 diff --git a/x11perf.man b/x11perf.man index e91eefd..711504a 100644 --- a/x11perf.man +++ b/x11perf.man @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.9 2003/05/29 21:48:11 herrb Exp $ +.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.8 2001/12/14 20:01:14 dawes Exp $ .\" .TH X11PERF 1 __xorgversion__ .SH NAME diff --git a/x11perfcomp.man b/x11perfcomp.man index 9825fe1..2750412 100644 --- a/x11perfcomp.man +++ b/x11perfcomp.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.8 2001/12/14 20:01:14 dawes Exp $ +.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.7 2001/01/27 18:21:07 dawes Exp $ .\" .TH X11PERFCOMP 1 __xorgversion__ .SH NAME -- cgit v1.2.3