[kbruch/f18: 7/7] Merge branch 'master' into f18
Than Ngo
than at fedoraproject.org
Mon Mar 4 15:48:37 UTC 2013
commit 44b7b6d8d1b93a38d1fc40ef7399ace460fdbfbe
Merge: 908f45c a81f404
Author: Than Ngo <than at redhat.com>
Date: Mon Mar 4 16:48:08 2013 +0100
Merge branch 'master' into f18
Conflicts:
.gitignore
kbruch.spec
sources
.gitignore | 1 +
kbruch.spec | 21 ++++++++++++++++++---
sources | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 8730456,97ab765..84aadb8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
+/kbruch-4.8.5.tar.xz
+/kbruch-4.9.1.tar.xz
+/kbruch-4.9.2.tar.xz
+/kbruch-4.9.3.tar.xz
+/kbruch-4.9.4.tar.xz
+/kbruch-4.9.5.tar.xz
+ /kbruch-4.10.1.tar.xz
More information about the scm-commits
mailing list