]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@amazon.com>
Tue, 19 Nov 2013 20:59:26 +0000 (12:59 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Tue, 19 Nov 2013 20:59:26 +0000 (12:59 -0800)
# By Jan Krupa (4) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
  configure: Use -B switch only for Python versions which support it
  qga: Fix shutdown command of guest agent to work with SysV
  console: Remove unused debug code
  qga: Fix compilation for old versions of MinGW
  .travis.yml: basic compile and check recipes
  pci-assign: Fix error_report of pci-stub message
  qapi: Fix comment for create-type to match code.
  vl: fix build when configured with no graphic support
  usb: drop unused USBNetState.inpkt field
  qemu-char: add missing characters used in keymaps
  qemu-char: add support for U-prefixed symbols
  qemu-char: add Czech keymap file
  qemu-char: add Czech characters to VNC keysyms

Message-id: 1384684850-6777-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
1  2 
Makefile
configure
vl.c

diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
diff --cc vl.c
Simple merge