diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:11 -0500 |
| commit | ac779fe2334ebea5d4a365b053d786f7748a1db5 (patch) | |
| tree | 5459fe587195dcb74b3b2ca19dc2d4a39a9fb31e /Makefile.objs | |
| parent | 13748cf499fbd93468e7103c0866e073a666f270 (diff) | |
| parent | 212496c98219df17913f3157a7bf85575b32384f (diff) | |
| download | qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.gz qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.bz2 qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.zip | |
Merge remote-tracking branch 'spice/spice.v37' into staging
Conflicts:
vl.c
Diffstat (limited to 'Makefile.objs')
0 files changed, 0 insertions, 0 deletions