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

Browse Source

Conflicts:
	rpm_spec/core-dom0.spec

...

This commit is contained in:

Joanna Rutkowska 2011-04-07 19:39:42 +02:00

parent 7d2c23aa80 0c0083c457

commit b62700572f

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