diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-31 11:09:00 -0500 |
| commit | 8494a397b68124f9898e7912173d460ee99ba3e2 (patch) | |
| tree | 2c3ff12f56cb2587d00bab448a226d3cf0042d64 /qemu-common.h | |
| parent | d439b79d730bf219e47c14ab94f1546bcc5045ab (diff) | |
| parent | 336a6915bc7089fb20fea4ba99972ad9a97c5f52 (diff) | |
| download | qemu-8494a397b68124f9898e7912173d460ee99ba3e2.zip qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.gz qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.bz2 | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Conflicts:
block/vmdk.c
Diffstat (limited to 'qemu-common.h')
0 files changed, 0 insertions, 0 deletions