Merge branch 'master' into f23

This commit is contained in:
Martin Stransky 2016-04-26 12:07:51 +02:00
commit f4c6d4b998

View File

@ -741,6 +741,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/browser/components/components.manifest %{mozappdir}/browser/components/components.manifest
%{mozappdir}/browser/defaults/preferences/firefox-redhat-default-prefs.js %{mozappdir}/browser/defaults/preferences/firefox-redhat-default-prefs.js
%{mozappdir}/browser/features/loop@mozilla.org.xpi %{mozappdir}/browser/features/loop@mozilla.org.xpi
%{mozappdir}/browser/features/e10srollout@mozilla.org.xpi
%{mozappdir}/browser/features/firefox@getpocket.com.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml %attr(644, root, root) %{mozappdir}/browser/blocklist.xml
%dir %{mozappdir}/browser/extensions %dir %{mozappdir}/browser/extensions
%{mozappdir}/browser/extensions/* %{mozappdir}/browser/extensions/*