core-admin/qubes/tools
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
..
__init__.py qubes: misc pylint fixes 2015-12-29 22:04:00 +01:00
qmemmand.py Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
qubes_create.py qubes/tools: add qvm-run, qvm-{,un}pause 2015-12-29 03:43:08 +01:00
qubes_prefs.py qubes: misc pylint fixes 2015-12-29 22:04:00 +01:00
qvm_create.py Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
qvm_kill.py qubes/tools: add qvm-run, qvm-{,un}pause 2015-12-29 03:43:08 +01:00
qvm_ls.py qubes/tools/qvm_ls: fix getting columns from mixin 2016-03-03 00:46:05 +01:00
qvm_pause.py qubes/tools: add qvm-run, qvm-{,un}pause 2015-12-29 03:43:08 +01:00
qvm_prefs.py qubes: misc pylint fixes 2015-12-29 22:04:00 +01:00
qvm_run.py qubes: misc pylint fixes 2015-12-29 22:04:00 +01:00
qvm_start.py Merge remote-tracking branch 'marmarek/master' into core3-devel 2016-03-03 01:13:51 +01:00
qvm_unpause.py qubes/tools: add qvm-run, qvm-{,un}pause 2015-12-29 03:43:08 +01:00