Marek Marczykowski 1914854e88 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core ... Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-prefs dom0/qvm-tools/qvm-template-commit		2011-03-09 17:23:32 +01:00
..
__init__.py	Initial public commit.	2010-04-05 20:58:57 +02:00
.gitignore	added .gitignore for *.pyo files in qvm-core	2010-06-14 23:53:54 +02:00
qubes.py	Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core	2011-03-09 17:23:32 +01:00