projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55519a4 9854202)
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Apr 2014 09:41:30 +0000 (10:41 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Apr 2014 09:41:30 +0000 (10:41 +0100)
commite792933ce1a9229d01b00f02caa39c39c30bcce8
treecbfd5992ed7c360c110e5fda9525dc7439369b87tree | snapshot
parent55519a4b244e4822774b593e36647ecf7598286bcommit | diff
parent9854202b57e0ac197cf2bee3d7fbf79ba58f16c5commit | 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>
Domain: SDK / Emulator;