summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2006-05-24 11:04:28 +0000
committerPeter Åstrand <astrand@cendio.se>2006-05-24 11:04:28 +0000
commit601eb615f7a1155bdf0518bd75872e9331b836fa (patch)
tree6c0db8fc7c62b4cbf8198bde288c68c68aad4301
parentbb92e1203066f02244eb26b6c1e2a09846314ce1 (diff)
downloadtigervnc-601eb615f7a1155bdf0518bd75872e9331b836fa.tar.gz
tigervnc-601eb615f7a1155bdf0518bd75872e9331b836fa.zip
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
-rw-r--r--xc/programs/Xserver/vnc/Xvnc/xvnc.cc11
1 files changed, 4 insertions, 7 deletions
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;