Merge remote-tracking branch 'joanna/master'

This commit is contained in:
Marek Marczykowski 2012-07-25 00:25:20 +02:00
commit d6eef25fd9
2 changed files with 2 additions and 2 deletions

View File

@ -98,7 +98,7 @@
<packagereq type="mandatory">qubes-gui-dom0</packagereq> <packagereq type="mandatory">qubes-gui-dom0</packagereq>
<packagereq type="mandatory">qubes-logos</packagereq> <packagereq type="mandatory">qubes-logos</packagereq>
<packagereq type="mandatory">qubes-manager</packagereq> <packagereq type="mandatory">qubes-manager</packagereq>
<packagereq type="mandatory">qubes-template-fedora-15-x64</packagereq> <packagereq type="mandatory">qubes-template-fedora-17-x64</packagereq>
<packagereq type="default">qubes-doc-dom0</packagereq> <packagereq type="default">qubes-doc-dom0</packagereq>
<packagereq type="default">qubes-gpg-split-dom0</packagereq> <packagereq type="default">qubes-gpg-split-dom0</packagereq>
</packagelist> </packagelist>

View File

@ -31,7 +31,7 @@ product_name = Qubes
product_path = Packages product_path = Packages
iso_basename = Qubes iso_basename = Qubes
iso_label = Qubes iso_label = Qubes
version = R1-rc1pre1 version = R1-rc1
version_from = F13 version_from = F13
comps_filter = 0 comps_filter = 0
revisor_comps = 1 revisor_comps = 1