[cantor/f18: 13/13] Merge branch 'master' into f18
Than Ngo
than at fedoraproject.org
Mon Mar 4 13:00:33 UTC 2013
commit 20de9c9d50b2b1e88d3f717b83c7e1685e52472e
Merge: 8d72dff a9b41a9
Author: Than Ngo <than at redhat.com>
Date: Mon Mar 4 14:00:03 2013 +0100
Merge branch 'master' into f18
Conflicts:
.gitignore
cantor.spec
sources
.gitignore | 1 +
cantor.spec | 28 ++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index f7ae856,77b163d..86aa78b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
+/cantor-4.8.5.tar.xz
+/cantor-4.9.1.tar.xz
+/cantor-4.9.2.tar.xz
+/cantor-4.9.3.tar.xz
+/cantor-4.9.4.tar.xz
+/cantor-4.9.5.tar.xz
+ /cantor-4.10.1.tar.xz
More information about the scm-commits
mailing list