[zarafa/f15: 2/2] Merge remote branch 'origin/master' into f15
Robert Scheck
robert at fedoraproject.org
Mon Jun 13 23:02:55 UTC 2011
commit 397012a81e7aba8c81bacc60cabebc74f1225205
Merge: b1e38fa 410170d
Author: Robert Scheck <robert at fedoraproject.org>
Date: Tue Jun 14 01:02:29 2011 +0200
Merge remote branch 'origin/master' into f15
.gitignore | 2 +-
sources | 2 +-
zarafa.spec | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc zarafa.spec
index 32b8973,dfab5f8..f6e0945
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -137,9 -137,9 +137,9 @@@
Summary: Open Source Edition of the Zarafa Collaboration Platform
Name: zarafa
- Version: 6.40.8
+ Version: 6.40.9
%if %{beta_or_rc}
-Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
+Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}.1
%else
Release: %{actual_release}%{?dist}
%endif
More information about the scm-commits
mailing list