Merge branch 'master' of git://git.qubes-os.org/joanna/installer-qubes-os

This commit is contained in:
Marek Marczykowski-Górecki 2014-03-31 19:12:23 +02:00
commit 6caccbec7c

View File

@ -1148,7 +1148,7 @@
<packagereq type="mandatory">qubes-gui-dom0</packagereq>
<packagereq type="mandatory">qubes-logos</packagereq>
<packagereq type="mandatory">qubes-manager</packagereq>
<packagereq type="mandatory">qubes-template-fedora-18-x64</packagereq>
<packagereq type="mandatory">qubes-template-fedora-20-x64</packagereq>
<packagereq type="default">qubes-gpg-split-dom0</packagereq>
<packagereq type="default">qubes-pdf-converter-dom0</packagereq>
<packagereq type="default">qubes-windows-tools</packagereq>