Merge remote branch 'origin/master' into f15

2012-06-19 23:57:16 +02:00 · 2012-05-09 00:34:30 +02:00 · 2012-04-22 05:49:32 +02:00 · 2012-01-13 01:32:27 +01:00 · 2012-01-13 01:32:11 +01:00 · 2011-12-17 16:17:58 +01:00
1 changed files with 1 additions and 1 deletions
--- a/zarafa.spec
+++ b/zarafa.spec
@ -21,7 +21,7 @@ Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
 Version:            7.0.8
 %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
Author	SHA1	Message	Date
Robert Scheck	f6851c110a	Merge remote branch 'origin/master' into f15	2012-06-19 23:57:16 +02:00
Robert Scheck	ced234e337	Merge remote branch 'origin/master' into f15	2012-05-09 00:34:30 +02:00
Robert Scheck	c03b00aab2	Merge remote branch 'origin/master' into f15	2012-04-22 05:49:32 +02:00
Robert Scheck	ea92498544	Merge branch 'f15' of ssh://pkgs.fedoraproject.org/zarafa into f15	2012-01-13 01:32:27 +01:00
Robert Scheck	50df742343	Merge remote branch 'origin/master' into f15	2012-01-13 01:32:11 +01:00
Robert Scheck	152c78d616	Merge remote branch 'origin/master' into f15	2011-12-17 16:17:58 +01:00
Robert Scheck	16759d59da	Merge remote branch 'origin/master' into f15	2011-11-20 02:12:46 +01:00
Robert Scheck	510e30feeb	Merge remote branch 'origin/master' into f15	2011-10-01 14:03:50 +02:00
Robert Scheck	20f1e60df9	Merge remote branch 'origin/master' into f15	2011-08-14 01:57:52 +02:00
Robert Scheck	14a6926cfc	Merge remote branch 'origin/master' into f15	2011-06-27 15:07:04 +02:00
Robert Scheck	397012a81e	Merge remote branch 'origin/master' into f15	2011-06-14 01:02:29 +02:00
Robert Scheck	b1e38fa3f8	Merge remote branch 'origin/master' into f15	2011-05-28 15:10:50 +02:00
Robert Scheck	8e68e8fffe	Merge remote branch 'origin/master' into f15	2011-04-06 01:16:30 +02:00
Robert Scheck	ede8ab090d	Merge remote branch 'origin/master' into f15	2011-04-06 01:02:14 +02:00
Robert Scheck	97566cb866	Merge branch 'f15/master' of ssh://pkgs.fedoraproject.org/zarafa into f15 Conflicts: zarafa.spec	2011-03-24 06:59:31 +01:00
Dan Horák	58913a22b3	rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)	2011-03-23 19:59:04 +01:00