Merge tag 'smk_a8cef51b' of ssh://git.qubes-os.org/var/lib/qubes/git/smoku/core

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-ls

...

This commit is contained in:

Marek Marczykowski 2011-03-10 13:39:37 +01:00

parent 223f14e21c 2729c6447b

commit 07abd184ab

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