Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core

Browse Source

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

...

This commit is contained in:

Marek Marczykowski 2011-03-09 17:23:32 +01:00

parent 45f70b4e02 088adcc95f

commit 223f14e21c

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