Conflicts: dom0/init.d/qubes_core dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-prefs version_dom0 version_vm |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| .gitignore | ||
| guihelpers.py | ||
| qubes.py | ||
| qubesutils.py | ||
Conflicts: dom0/init.d/qubes_core dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-prefs version_dom0 version_vm |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| .gitignore | ||
| guihelpers.py | ||
| qubes.py | ||
| qubesutils.py | ||