9eafa57539
The following list is bollocks. There were many, many more.
Conflicts:
core-modules/003QubesTemplateVm.py
core-modules/005QubesNetVm.py
core/qubes.py
core/storage/__init__.py
core/storage/xen.py
doc/qvm-tools/qvm-pci.rst
doc/qvm-tools/qvm-prefs.rst
qubes/tools/qmemmand.py
qvm-tools/qvm-create
qvm-tools/qvm-prefs
qvm-tools/qvm-start
tests/__init__.py
vm-config/xen-vm-template-hvm.xml
This commit took 2 days (26-27.01.2016) and put our friendship to test.
--Wojtek and Marek
|
||
|---|---|---|
| .. | ||
| storage | ||
| tests | ||
| __init__.py | ||
| .gitignore | ||
| backup.py | ||
| guihelpers.py | ||
| Makefile | ||
| modules | ||
| qubes.py | ||
| qubesutils.py | ||
| settings-xen-Linux.py | ||