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

Browse Source

Conflicts:
	dom0/pm-utils/01qubes-sync-vms-clock

...

This commit is contained in:

Joanna Rutkowska 2012-02-01 19:01:55 +01:00

parent 04976255f4 e0660cfd69

commit afab6193cf

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