Merge branch 'master' into f20

This commit is contained in:
Adam Jackson 2014-04-16 10:57:14 -04:00
commit a5a4159bbf

View File

@ -392,7 +392,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
--with-gallium-drivers=%{?with_llvm:swrast} \
%endif
%if 0%{?fedora} < 21
--disable-dri3
--disable-dri3 \
%endif
%{?dri_drivers}