# HG changeset patch
# User Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
# Date 1319455129 -32400
# Node ID ec3842bc0aeb066fb1b33dd0f39428ebbcdd239a
# Parent  eea9a1726edf4185b06e928f4d6d9627fbd854c0# Parent  f7f4c3fdbbea803a2eaa822fef4f6f2fc9476f25
merge

diff -r eea9a1726edf -r ec3842bc0aeb src/myVncProxy/AcceptClient.java