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
..
storage	Merge remote-tracking branch 'marmarek/master' into core3-devel	2016-03-03 01:13:51 +01:00
tests	qubesutils.py: get_disk_usage	2014-04-24 21:50:12 +02:00
__init__.py	Move all files one level up	2013-03-16 19:56:51 +01:00
.gitignore	Move all files one level up	2013-03-16 19:56:51 +01:00
guihelpers.py	Fixed PyQt4 import in guihelpers	2014-11-19 12:50:31 +01:00
Makefile	core3: qubesmanager notifying extension	2015-10-05 12:46:14 +02:00
modules	add convenient symlinks simulating target python files layout	2014-03-10 01:05:01 +01:00
qubes.py	Merge remote-tracking branch 'origin/master' into core3-devel	2016-11-30 03:07:39 +01:00
qubesutils.py	Merge remote-tracking branch 'origin/master' into core3-devel	2016-11-30 03:07:39 +01:00
settings-xen-Linux.py	Rename storage dir to dir_path, type to driver	2015-11-21 14:46:23 +01:00