Merge branch 'master' into hvm

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-create
	dom0/qvm-tools/qvm-prefs

...

This commit is contained in:

Marek Marczykowski 2012-03-09 11:34:13 +01:00

parent cd3b40c407 703c74397f

commit 4d09708976

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available