]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
projects / lisovros / qemu_apohw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Virtual HW used in A0B36APO subject