merge of a585c2284e9ad17bfe6c6fd8f18b1c5042b2df47

     and e3f735bb16fbd5cfb6bcad70885550c1b79b874c

--HG--
extra : convert_revision : d6dc5dca7b7982493c6d43b19439f4e64f6dc99e

2 files changed, 1 insertions, 1 deletions

diff --git a/Makefile.in b/Makefile.in
index cc3127a..8ad1677 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@ COMMONOBJS=dbutil.o common-session.o common-packet.o common-algo.o buffer.o \
 		common-kex.o dss.o bignum.o \
 		signkey.o rsa.o random.o common-channel.o \
 		common-chansession.o queue.o termcodes.o  \
-		loginrec.o atomicio.o x11fwd.o tcpfwd-direct.o compat.o \
+		loginrec.o atomicio.o svr-x11fwd.o tcpfwd-direct.o compat.o \
 		tcpfwd-remote.o listener.o
 
 SVROBJS=svr-kex.o svr-packet.o svr-algo.o svr-auth.o sshpty.o \
diff --git a/x11fwd.c b/svr-x11fwd.c
index 12a8f21..12a8f21 100644
--- a/x11fwd.c
+++ b/svr-x11fwd.c