]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'sweil/mingw' into stable-1.5
authorAnthony Liguori <anthony@codemonkey.ws>
Thu, 29 Aug 2013 22:20:17 +0000 (17:20 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Thu, 29 Aug 2013 22:20:17 +0000 (17:20 -0500)
# By Stefan Weil
# Via Stefan Weil
* sweil/mingw:
  gtk: Remove unused include statements which are not portable
  w32: Add an icon resource
  w32: Fix broken out-of-tree builds (missing version.o)

Message-id: 1377607132-21336-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>

Trivial merge