[rkward/f14: 13/13] Merge branch 'master' into f14
Pierre-YvesChibon
pingou at fedoraproject.org
Tue Oct 25 08:16:33 UTC 2011
commit 089e6a7c7677c8a407e03e2b470b4be2437ab26b
Merge: 2df6fa5 8ae1d11
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Tue Oct 25 10:16:20 2011 +0200
Merge branch 'master' into f14
Conflicts:
.gitignore
rkward.spec
sources
.gitignore | 2 +-
rkward.spec | 28 ++++++++++++++--------------
sources | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index caa01fc,38ae8e5..1af613d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,4 @@@
rkward-0.5.3.tar.gz
/rkward-0.5.4.tar.gz
/rkward-0.5.5.tar.gz
--/rkward-0.5.6.tar.gz
+ /rkward-0.5.7.tar.gz
More information about the scm-commits
mailing list