Merge remote-tracking branch 'qubesos/pr/5'

Browse Source

Conflicts:
	linux/aux-tools/prepare-volatile-img.sh

...

This commit is contained in:

Marek Marczykowski-Górecki 2015-08-08 04:15:08 +02:00

parent bbf22c4449 472ed54e4c

commit 34174ed548

No known key found for this signature in database

GPG Key ID: 063938BA42CFA724

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