Merge branch 'qmemman' of git://qubes-os.org/rafal/core

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py

...

This commit is contained in:

Joanna Rutkowska 2010-09-23 12:31:25 +02:00

parent b3fae338ed 6d764ef50d

commit 2f92d0156b

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