# HG changeset patch
# User nobuyasu  <dimolto@cr.ie.u-ryukyu.ac.jp>
# Date 1314685394 -32400
# Node ID d2decb2f0eb870945cbaf8eb34ea1c9cbf76a712
# Parent  7929f447692f8780062c80699d860eb4f8a08f0d# Parent  c3ae65fea76ab507a7b361edad902ef0c362ed9c
merge 135

diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/CreateThread.java
--- a/src/myVncProxy/CreateThread.java	Tue Aug 30 15:21:39 2011 +0900
+++ b/src/myVncProxy/CreateThread.java	Tue Aug 30 15:23:14 2011 +0900
@@ -45,7 +45,7 @@
 
 			}
 		}
-		System.out.println("accept port = " + port);
+		System.out.println("accept Echo port = " + port);
 	}
 	
 	void initServSock(int port) throws IOException {
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/MyRfbProto.java
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/ProxyVncCanvas.java
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/RfbProto.java
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/VncProxyService.java
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/VncViewer.java
diff -r 7929f447692f -r d2decb2f0eb8 src/myVncProxy/ZlibInStream.java