summaryrefslogtreecommitdiff
path: root/profiles/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/qemu')
-rw-r--r--profiles/qemu/package.sync-conflict-20170516-120307.use5
1 files changed, 5 insertions, 0 deletions
diff --git a/profiles/qemu/package.sync-conflict-20170516-120307.use b/profiles/qemu/package.sync-conflict-20170516-120307.use
new file mode 100644
index 0000000..e6ccabe
--- /dev/null
+++ b/profiles/qemu/package.sync-conflict-20170516-120307.use
@@ -0,0 +1,5 @@
+app-emulation/qemu usb vhost-net virgl vte xattr fdt aio spice
+
+net-misc/spice-gtk gtk3 gstvideo lz4 mjpeg usbredir webdav
+app-emulation/spice lz4
+net-libs/phodav spice