Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm

Browse Source

Conflicts:
	version_dom0
	version_vm

...

This commit is contained in:

Joanna Rutkowska 2012-03-02 02:24:37 +01:00

parent 33c8c83cd9 57e4423cac

commit 00b0bd6d42

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