Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/template-builder

2012-01-16 03:42:27 +01:00 · 2012-01-16 03:42:27 +01:00 · f9cda5b99f
commit f9cda5b99f
parent 5d3cced9e1 db0b9058c6
5 changed files with 4 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
 *~
+base_rpms
+keys
--- a/1
+++ b/1
@ -1 +0,0 @@
-base_rpms_fc14
--- a/1
+++ b/1
@ -1 +0,0 @@
-keys_fc14
--- a/2
+++ b/2
@ -1 +1 @@
-1.4.1
+1.4.2
--- a/2
+++ b/2
@ -1 +1 @@
-4.1.1-6.qubes.x86_64
+4.1.1-7.qubes.x86_64
 @ -1 +1 @@
 .4.1
 .4.2