| commit | 4447d609688e75a40a10b559e3b6ae83843e3095 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 5 Oct 2010 19:14:19 +0000 (5 14:14 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 5 Oct 2010 19:14:19 +0000 (5 14:14 -0500) | ||
| tree | 94e721b263ae28e68e8f1ccd1aa7db401c8b7129 | treesnapshot (tar.gz zip) |
| parent | 48f57044e6a826329ebcac5d5a76d776a14e5d43 | commitdiff |
| parent | 869564a9c0f78b1972e1ac51e69cb2016af3b060 | commitdiff |
Merge remote branch 'spice/submit.6' into staging
Conflicts:
configure
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Conflicts:
configure
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| Makefile.objs | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| qemu-config.c | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |