core-admin/qubes/vm
Wojtek Porczyk 9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel
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
2016-03-03 01:13:51 +01:00
..
mix Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
__init__.py Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
adminvm.py core3: Add documentation to qubes.exc 2015-10-17 00:20:44 +02:00
appvm.py qubes: pylint fixes 2015-10-05 23:49:39 +02:00
dispvm.py qubes: documentation and licence fixes 2015-06-29 17:39:27 +02:00
hvm.py qubes: documentation and licence fixes 2015-06-29 17:39:27 +02:00
qubesvm.py Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
templatehvm.py qubes: documentation and licence fixes 2015-06-29 17:39:27 +02:00
templatevm.py qubes: pylint fixes 2015-10-05 23:49:39 +02:00