Merge branch 'master' into f26

- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
2017-12-27 06:46:12 +01:00 · 2017-05-15 21:06:35 +00:00
1 changed files with 1 additions and 0 deletions
--- a/guitarix.spec
+++ b/guitarix.spec
@ -240,6 +240,7 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
 * Fri Apr 21 2017 Brendan Jones <brendan.jones.it@gmail.com> - 0.35.2-1
 - Remove webkit

+>>>>>>> master
 * Sun Feb 19 2017 Brendan Jones <brendan.jones.it@gmail.com> - 0.35.2-1
 - Update to 0.35.2
Author	SHA1	Message	Date
Brendan Jones	c1783e69dd	Merge branch 'master' into f26	2017-12-27 06:46:12 +01:00
Fedora Release Engineering	660fb97c40	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild	2017-05-15 21:06:35 +00:00