| commit | 18f19f6d77025f47f31e40ad03d07b4858ceeb31 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 30 Aug 2013 04:04:31 +0000 (30 06:04 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 30 Aug 2013 04:04:31 +0000 (30 06:04 +0200) | ||
| tree | 3d7ac81821ca00caf1000a654e2e6bb4e722ff49 | treesnapshot (tar.gz zip) |
| parent | 2e42a239db70ffd845f0508dfc60106cc20beec8 | commitdiff |
| parent | b5d54bd42158b90b239bb6ce9c13072eb3a53fd2 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
ui/gtk.c
Conflicts:
ui/gtk.c
| include/exec/exec-all.h | diff1 | diff2 | blobhistory |
| target-i386/cpu.h | diff1 | diff2 | blobhistory |
| target-i386/kvm.c | diff1 | diff2 | blobhistory |
| target-mips/helper.c | diff1 | diff2 | blobhistory |