448cc30b0f
Conflicts: dom0/qvm-core/qubes.py |
||
---|---|---|
appvm | ||
common | ||
netvm | ||
proxyvm | ||
rpm_spec | ||
.gitignore | ||
LICENSE | ||
Makefile | ||
version_vaio_fixes | ||
version_vm |
448cc30b0f
Conflicts: dom0/qvm-core/qubes.py |
||
---|---|---|
appvm | ||
common | ||
netvm | ||
proxyvm | ||
rpm_spec | ||
.gitignore | ||
LICENSE | ||
Makefile | ||
version_vaio_fixes | ||
version_vm |