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

Browse Source

Conflicts:
	version_dom0

...

This commit is contained in:

Marek Marczykowski 2012-03-08 18:06:30 +01:00

parent ba7822975d 2e0cc83c1a

commit 060b55ba8a

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