diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-08-05 12:58:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-08-05 12:58:59 +0200 |
| commit | 12242a37d8eef68ba19776c9f5b1606843f3c236 (patch) | |
| tree | fee4afd414788d2f232da1a99b5a323a616ada4f /gen-icount.h | |
| parent | 59d71ddb432db04b57ee2658ce50a3e35d7db97e (diff) | |
| parent | 91db0417ac64255a297d88543bc91b439a48c013 (diff) | |
Merge remote branch 'kraxel/spice.v14' into spice.kvm.v14spice.kvm.v14.spicevmc
Conflicts:
Makefile.target
configure
hw/pc.c
monitor.c
pc-bios/vgabios-cirrus.bin
pc-bios/vgabios.bin
Diffstat (limited to 'gen-icount.h')
0 files changed, 0 insertions, 0 deletions