diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-08 10:41:30 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-08 10:41:30 +0100 |
commit | e792933ce1a9229d01b00f02caa39c39c30bcce8 (patch) | |
tree | cbfd5992ed7c360c110e5fda9525dc7439369b87 /qemu-io.c | |
parent | 55519a4b244e4822774b593e36647ecf7598286b (diff) | |
parent | 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5 (diff) |
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging
* remotes/mdroth/qga-pull-2014-4-7:
vss-win32: Fix build with mingw64-headers-3.1.0
Makefile: add qga-vss-dll-obj-y to nested variables
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io.c')
0 files changed, 0 insertions, 0 deletions