Merge branch 'master' into el6

Conflicts: monotone.spec
- Add patch for failing tests on ppc64.
2011-05-15 16:18:42 +02:00 · 2011-01-09 16:21:36 +01:00 · 2011-01-07 01:31:47 +01:00 · 2010-10-28 01:52:29 +02:00 · 2010-07-29 03:40:15 +00:00 · 2010-07-04 22:07:34 +00:00
1 changed files with 3 additions and 0 deletions
--- a/monotone.spec
+++ b/monotone.spec
@ -234,6 +234,9 @@ fi
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

+* Sun Jan  9 2011 Thomas Moschny <thomas.moschny@gmx.de> - 0.99.1-2
+- Add patch for failing tests on ppc64.
+
 * Sun Oct 31 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.99.1-1
 - Update to 0.99.1.
 - Remove patch already applied upstream.
Author	SHA1	Message	Date
Thomas Moschny	acfcb82888	Merge branch 'master' into el6 Conflicts: monotone.spec	2011-05-15 16:18:42 +02:00
Thomas Moschny	0160a3cf3c	- Add patch for failing tests on ppc64.	2011-01-09 16:21:36 +01:00
Thomas Moschny	76ffa3275f	Merge branch 'master' into el6	2011-01-07 01:31:47 +01:00
Thomas Moschny	e65e7f85c7	Merge branch 'master' into el6 Conflicts: .gitignore monotone.spec sources	2010-10-28 01:52:29 +02:00
Fedora Release Engineering	4d4b306516	dist-git conversion	2010-07-29 03:40:15 +00:00
Thomas Moschny	685f11c1d0	Update to 0.48.	2010-07-04 22:07:34 +00:00
Dennis Gilmore	44c1e23a2d	Initialize branch EL-6 for monotone	2010-05-08 02:00:17 +00:00
Thomas Moschny	81927fc62f	Update to 0.46.	2010-01-23 22:16:02 +00:00
Bill Nottingham	30388ab699	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:39:52 +00:00