[zarafa/el5/master: 15/15] Merge remote branch 'origin/master' into el5
Robert Scheck
robert at fedoraproject.org
Mon Aug 9 20:46:16 UTC 2010
commit 1d8c1cdea94001cf645b387d55cfcb13d7690f32
Merge: 2c2a873 295fbd2
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Aug 9 22:46:02 2010 +0200
Merge remote branch 'origin/master' into el5
Conflicts:
.gitignore
sources
zarafa.spec
.gitignore | 2 +-
sources | 2 +-
zarafa-6.40.0-clucene.patch | 56 ----------------------------------------
zarafa-6.40.0-krb5.patch | 20 --------------
zarafa-6.40.0-openssl.patch | 23 ----------------
zarafa-6.40.0-pthread.patch | 59 -------------------------------------------
zarafa.spec | 31 ++++++++++------------
7 files changed, 16 insertions(+), 177 deletions(-)
---
diff --cc .gitignore
index 86578d6,7551c2f..19416c0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--zarafa-6.40.0.tar.gz
+ zarafa-6.40.1.tar.gz
More information about the scm-commits
mailing list