[zarafa/el6/master: 15/15] Merge remote branch 'origin/master' into el6
Robert Scheck
robert at fedoraproject.org
Mon Aug 9 20:43:31 UTC 2010
commit 313443d044a50d8b7d946bdfd9aa4b117fdcb066
Merge: 5962fec 295fbd2
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Aug 9 22:43:18 2010 +0200
Merge remote branch 'origin/master' into el6
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 | 33 +++++++++++-------------
7 files changed, 17 insertions(+), 178 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