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).

6 files changed, 6 insertions, 6 deletions

diff --git a/auth.c b/auth.c
index 5a1e2fc..a9e74e4 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
 /* OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT	*/
 /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	*/
 /************************************************************************/
-/* $XFree86: xc/programs/rstart/auth.c,v 1.5 2001/07/25 15:05:15 dawes Exp $ */
+/* $XFree86: xc/programs/rstart/auth.c,v 1.4 2001/01/17 23:45:03 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Xos.h>
diff --git a/rstart.man b/rstart.man
index 01cb0d0..b0f6017 100644
--- a/rstart.man
+++ b/rstart.man
@@ -19,7 +19,7 @@
 .\" REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $XFree86: xc/programs/rstart/rstart.man,v 1.7 2003/05/29 21:48:11 herrb Exp $
+.\" $XFree86: xc/programs/rstart/rstart.man,v 1.6 2001/01/27 18:21:05 dawes Exp $
 .\"
 .hy 0		\" I hate hyphenation.
 .de EX		\"Begin example
diff --git a/rstartd.man b/rstartd.man
index dd56e81..c2e847c 100644
--- a/rstartd.man
+++ b/rstartd.man
@@ -19,7 +19,7 @@
 .\" REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $XFree86: xc/programs/rstart/rstartd.man,v 1.7 2002/10/12 16:06:45 herrb Exp $
+.\" $XFree86: xc/programs/rstart/rstartd.man,v 1.6 2001/01/27 18:21:05 dawes Exp $
 .\"
 .hy 0		\" I hate hyphenation.
 .de EX		\"Begin example
diff --git a/server.c b/server.c
index a6d9ad5..3dde6f7 100644
--- a/server.c
+++ b/server.c
@@ -23,7 +23,7 @@
 /* OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT	*/
 /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	*/
 /************************************************************************/
-/* $XFree86: xc/programs/rstart/server.c,v 1.6 2003/05/27 22:26:57 tsi Exp $ */
+/* $XFree86: xc/programs/rstart/server.c,v 1.5tsi Exp $ */
 
 /* Extended rsh "helper" program */
 #include <stdio.h>
diff --git a/server.cpp b/server.cpp
index d4977a8..3501b40 100644
--- a/server.cpp
+++ b/server.cpp
@@ -24,6 +24,6 @@ XCOMM PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS
 XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
 XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 XCOMM
-XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.3 2004/01/09 00:28:50 dawes Exp $
+XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.2 2001/01/17 23:45:03 dawes Exp $
 
 exec BINDIR/SERVERNAME.real -c LIBDIR/config
diff --git a/server.os2 b/server.os2
index 27000ac..3866a6c 100644
--- a/server.os2
+++ b/server.os2
@@ -24,6 +24,6 @@ XCOMM PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS
 XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
 XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 XCOMM
-XCOMM $XFree86: xc/programs/rstart/server.os2,v 1.1 2000/08/26 04:30:57 dawes Exp $
+XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.0 1995/03/11 14:20:38 dawes Exp $
 
 start LIBDIR/SERVERNAME -c LIBDIR/config