fix up changelog after merging master

Merge branch 'master' into f19
* master: update to latest upstream - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
2014-09-25 10:45:19 -05:00 · 2014-09-25 10:44:44 -05:00 · 2014-07-09 10:37:05 -05:00 · 2014-01-24 12:56:10 -06:00 · 2013-10-15 13:58:55 -05:00 · 2013-08-27 19:03:21 -05:00
2 changed files with 0 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,2 @@
-/quassel-0.7.3.tar.bz2
-/quassel-0.8.0.tar.bz2
-/quassel-0.9.0.tar.bz2
-/quassel-0.9.1.tar.bz2
-/quassel-0.9.2.tar.bz2
 /quassel-0.10.0.tar.bz2
 /quassel-0.11.0.tar.bz2
--- a/quassel.spec
+++ b/quassel.spec
@ -119,15 +119,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 * Wed Sep 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.11.0-1
 - Update to latest upstream

-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
 * Wed Jul 09 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.10.0-1
 - Update to latest upstream release

-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Fri Jan 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.9.2-1
 - Update to latest upstream release

@ -138,9 +132,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 * Tue Aug 27 2013 Adam Miller <maxamillion@fedoraproject.org> - 0.9.0-1
 - Update to latest upstream release

-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.8.0-3
 - Perl 5.18 rebuild
Author	SHA1	Message	Date
Adam Miller	0c2de542e1	fix up changelog after merging master	2014-09-25 10:45:19 -05:00
Adam Miller	b3c0684f82	Merge branch 'master' into f19 * master: update to latest upstream - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-09-25 10:44:44 -05:00
Adam Miller	8be1393b75	Merge branch 'master' into f19 * master: update to latest upstream - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild updated to latest upstream Update to latest upstream release/Fix for CVE-2013-4422 (BZ#1017437) update to latest upstream 0.9.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild Perl 5.18 rebuild Conflicts: .gitignore quassel.spec sources	2014-07-09 10:37:05 -05:00
Adam Miller	90a5297811	updated to latest upstream	2014-01-24 12:56:10 -06:00
Adam Miller	a4fae19ab0	fix changelog	2013-10-15 13:58:55 -05:00
Adam Miller	d25a9da5a3	latest upstream release - 0.9.0	2013-08-27 19:03:21 -05:00