Wojtek Porczyk 68ad60c1b3 Merge remote-tracking branch 'origin/master' into core3-devel ... Conflicts: core/qubes.py doc/Makefile doc/manpages/qvm-prefs.rst doc/qvm-tools/qvm-add-appvm.rst doc/qvm-tools/qvm-backup-restore.rst doc/qvm-tools/qvm-backup.rst doc/qvm-tools/qvm-block.rst doc/qvm-tools/qvm-clone.rst doc/qvm-tools/qvm-firewall.rst doc/qvm-tools/qvm-ls.rst doc/qvm-tools/qvm-pci.rst doc/qvm-tools/qvm-run.rst doc/qvm-tools/qvm-shutdown.rst doc/qvm-tools/qvm-start.rst doc/qvm-tools/qvm-template-commit.rst qvm-tools/qvm-ls qvm-tools/qvm-prefs qvm-tools/qvm-remove tests/__init__.py vm-config/xen-vm-template.xml		2016-11-30 03:07:39 +01:00
..
__init__.py	qmemman: support simple VM meminfo format	2016-09-08 04:17:48 +02:00
.gitignore	core3: move qmemman	2015-10-05 12:46:14 +02:00
algo.py	Merge remote-tracking branch 'origin/master' into core3-devel	2016-11-30 03:07:39 +01:00
client.py	qubes: pylint fixes	2015-10-05 23:49:39 +02:00