diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /ui | |
parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
download | qemu-9423a2e8dd362a271bfe194ec131062814557b95.zip qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.bz2 |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'ui')
-rw-r--r-- | ui/vnc-enc-zywrle-template.c | 2 | ||||
-rw-r--r-- | ui/vnc-enc-zywrle.h | 2 | ||||
-rw-r--r-- | ui/vnc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/vnc-enc-zywrle-template.c b/ui/vnc-enc-zywrle-template.c index 4cde6e4..561f7bf 100644 --- a/ui/vnc-enc-zywrle-template.c +++ b/ui/vnc-enc-zywrle-template.c @@ -9,7 +9,7 @@ * * * THE 'ZYWRLE' VNC CODEC SOURCE CODE IS (C) COPYRIGHT 2006 * * BY Hitachi Systems & Services, Ltd. * - * (Noriaki Yamazaki, Research & Developement Center) * + * (Noriaki Yamazaki, Research & Development Center) * * * * * ******************************************************************** diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h index ac5d27a..1ff40b1 100644 --- a/ui/vnc-enc-zywrle.h +++ b/ui/vnc-enc-zywrle.h @@ -8,7 +8,7 @@ * * * THE 'ZYWRLE' VNC CODEC SOURCE CODE IS (C) COPYRIGHT 2006 * * BY Hitachi Systems & Services, Ltd. * - * (Noriaki Yamazaki, Research & Developement Center) * + * (Noriaki Yamazaki, Research & Development Center) * * * * * ******************************************************************** @@ -2183,7 +2183,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len) #ifdef CONFIG_VNC_TLS case VNC_AUTH_VENCRYPT: - VNC_DEBUG("Accept VeNCrypt auth\n");; + VNC_DEBUG("Accept VeNCrypt auth\n"); start_auth_vencrypt(vs); break; #endif /* CONFIG_VNC_TLS */ |