| commit | b14fd0fe71e46db210a4cba137ee3dc51722ba2b | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Tue, 15 Jul 2014 07:20:15 +0000 (15 09:20 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Tue, 15 Jul 2014 07:20:15 +0000 (15 09:20 +0200) | ||
| tree | c86c52d31aa1ffe1d0bdb4de286249a1c6971979 | treesnapshot (tar.gz zip) |
| parent | f68d129a0b8225990cc883bf10b13217260fabb7 | commitdiff |
| parent | 42ca32f776c364c6a4c10d7100505b00b7a7f14e | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
configure
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
configure
Signed-off-by: Stefan Weil <sw@weilnetz.de>
| configure | diff1 | diff2 | blobhistory |
| hw/mips/mips_malta.c | diff1 | diff2 | blobhistory |
| target-i386/cpu.c | diff1 | diff2 | blobhistory |
| ui/gtk.c | diff1 | diff2 | blobhistory |