summary refs log tree commit diff stats
path: root/qemu-timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-12-11 11:19:57 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-12-11 11:19:57 +0000
commit67a5eebca1ac15442f06096977381a70a403bc5b (patch)
treeedde07d464ae4ebb7b8c94cc131cf50a177cd8c5 /qemu-timer.c
parent7fb8da2b8861795e0013e6ee97acd0363d868a35 (diff)
parent43948386bb109b97b3de0bb48573f317bdcb5008 (diff)
downloadfocaccia-qemu-67a5eebca1ac15442f06096977381a70a403bc5b.tar.gz
focaccia-qemu-67a5eebca1ac15442f06096977381a70a403bc5b.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20141210-1' into staging
vnc-enc-tight fix, keymaps code style.

# gpg: Signature made Wed 10 Dec 2014 09:24:33 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vnc-20141210-1:
  keymaps: correct keymaps.c following Qemu coding style
  vnc-enc-tight: fix Arguments in wrong order

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-timer.c')
0 files changed, 0 insertions, 0 deletions