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

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py

...

This commit is contained in:

Marek Marczykowski 2011-07-08 21:37:43 +02:00

parent 3b81062087 be515f13f3

commit 448cc30b0f

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