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
..
qmemman.conf	core3: move qmemman	2015-10-05 12:46:14 +02:00
storage.conf	Merge remote-tracking branch 'marmarek/master' into core3-devel	2016-03-03 01:13:51 +01:00