# HG changeset patch
# User Nobuyasu Oshiro  <dimolto@cr.ie.u-ryukyu.ac.jp>
# Date 1314654658 -32400
# Node ID c3ae65fea76ab507a7b361edad902ef0c362ed9c
# Parent  acd88e63854b1b9189313acd5abadc0f5fe8e7fd# Parent  0571d955da35d10f5e03674fdbf9c9a2c8e275f2
merge 129

diff -r acd88e63854b -r c3ae65fea76a src/myVncProxy/ProxyVncCanvas.java
diff -r acd88e63854b -r c3ae65fea76a src/myVncProxy/VncViewer.java
diff -r acd88e63854b -r c3ae65fea76a src/myVncProxy/ZlibInStream.java