From 4e14556c04921fb1ebdf00a4615670d88c09d148 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon, 29 Mar 2004 15:46:06 +0000
Subject: merge with XORG-RELEASE-1-TM

---
 xinit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'xinit.c')

diff --git a/xinit.c b/xinit.c
index a2384f2..ec2e6d0 100644
--- a/xinit.c
+++ b/xinit.c
@@ -26,7 +26,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 /* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
-
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
 #include <stdio.h>
@@ -123,6 +122,9 @@ char *server_names[] = {
 #ifdef XFREE86
     "XFree86     XFree86 displays",
 #endif
+#ifdef XORG
+    "Xorg	 X.Org displays",
+#endif
 #ifdef __DARWIN__
     "XDarwin         Darwin/Mac OS X IOKit displays",
     "XDarwinQuartz   Mac OS X Quartz displays",
-- 
cgit v1.2.3