Merge remote-tracking branch 'joanna/master'

12 years ago · d6eef25fd9
parent 22b87b5c9a bafb5a7a47
commit d6eef25fd9
2 changed files with 2 additions and 2 deletions
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@ -98,7 +98,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-15-x64</packagereq>
+      <packagereq type="mandatory">qubes-template-fedora-17-x64</packagereq>
      <packagereq type="default">qubes-doc-dom0</packagereq>
      <packagereq type="default">qubes-gpg-split-dom0</packagereq>
    </packagelist>
--- a/conf/qubes-install.conf
+++ b/conf/qubes-install.conf
@ -31,7 +31,7 @@ product_name = Qubes
 product_path = Packages
 iso_basename = Qubes
 iso_label = Qubes
-version = R1-rc1pre1
+version = R1-rc1
 version_from = F13
 comps_filter = 0
 revisor_comps = 1