diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-05 14:14:19 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-05 14:14:19 -0500 |
| commit | 4447d609688e75a40a10b559e3b6ae83843e3095 (patch) | |
| tree | 94e721b263ae28e68e8f1ccd1aa7db401c8b7129 /simpletrace.h | |
| parent | 48f57044e6a826329ebcac5d5a76d776a14e5d43 (diff) | |
| parent | 869564a9c0f78b1972e1ac51e69cb2016af3b060 (diff) | |
| download | qemu-4447d609688e75a40a10b559e3b6ae83843e3095.tar.gz | |
Merge remote branch 'spice/submit.6' into staging
Conflicts:
configure
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'simpletrace.h')
0 files changed, 0 insertions, 0 deletions