Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	dom0/qvm-tools/qvm-template-commit
This commit is contained in:
Marek Marczykowski 2011-03-09 17:23:32 +01:00
commit 1914854e88
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom0/qvm-core/qubes.py
View File

@ -2049,4 +2049,4 @@ class QubesDaemonPidfile(object):
self.remove_pidfile() self.remove_pidfile()
# vim:sw=4:et:ts=4: # vim:sw=4:et: