From: Peter Åstrand <astrand@cendio.se>
Date: Wed, 24 May 2006 11:04:28 +0000 (+0000)
Subject: Removed duplicate definition of ddxInitGlobals. Adapt Copyright.
X-Git-Tag: v0.0.90~384^2~287
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=601eb615f7a1155bdf0518bd75872e9331b836fa;p=tigervnc.git

Removed duplicate definition of ddxInitGlobals. Adapt Copyright.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@585 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index fcb73e65..5daf663d 100644
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -87,9 +87,11 @@ extern "C" {
 #undef and
 }
 
-#define XVNCVERSION "Free Edition 4.1.1"
+#define XVNCVERSION "TightVNC 1.5 series"
 #define XVNCCOPYRIGHT ("Copyright (C) 2002-2005 RealVNC Ltd.\n" \
-                       "See http://www.realvnc.com for information on VNC.\n")
+		       "Copyright (C) 2000-2006 Constantin Kaplinsky\n" \
+		       "Copyright (C) 2004-2006 Peter Astrand, Cendio AB\n" \
+                       "See http://www.tightvnc.com for information on TightVNC.\n")
 
 
 extern char *display;
@@ -203,11 +205,6 @@ vfbBitsPerPixel(int depth)
 
 extern "C" {
 
-  /* ddxInitGlobals - called by |InitGlobals| from os/util.c in XOrg */
-  void ddxInitGlobals(void)
-  {
-  }
-
   void ddxGiveUp()
   {
     int i;