| commit | 444bbccece26b8632e0c83743cf6982d1104cdf2 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 6 Oct 2017 21:17:30 +0000 (6 23:17 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 6 Oct 2017 21:17:51 +0000 (6 23:17 +0200) | ||
| tree | c1d560638db3dc52073f36d8499c742db250d447 | treesnapshot (tar.gz zip) |
| parent | f120dccce6503f40a9f409adcc755834a3deafcf | commitdiff |
| parent | a26a98dfb9d448d7234d931ae3720feddf6f0651 | commitdiff |
Merge remote-tracking branch 'qemu/master'
# Conflicts:
# .gitmodules
# hw/display/vga-helpers.h
# hw/mips/Makefile.objs
# qemu-doc.texi
# target/alpha/mem_helper.c
# target/arm/translate.c
# target/i386/translate.c
# target/mips/cpu.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>
# Conflicts:
# .gitmodules
# hw/display/vga-helpers.h
# hw/mips/Makefile.objs
# qemu-doc.texi
# target/alpha/mem_helper.c
# target/arm/translate.c
# target/i386/translate.c
# target/mips/cpu.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>
70 files changed: