Merge branch 'master' into f20

This commit is contained in:
Igor Gnatenko 2014-04-19 19:01:53 +04:00
commit 635d534dda
3 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View File

@ -67,3 +67,4 @@ mesa-20100720.tar.bz2
/mesa-20140225.tar.xz
/mesa-20140301.tar.xz
/mesa-20140305.tar.xz
/mesa-20140419.tar.xz

View File

@ -49,13 +49,13 @@
%define _default_patch_fuzz 2
%define gitdate 20140305
%define gitdate 20140419
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
Version: 10.1
Release: 6.%{gitdate}%{?dist}
Version: 10.1.1
Release: 1.%{gitdate}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@ -645,6 +645,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Sat Apr 19 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.1-1.20140419
- 10.1.1 upstream release
* Tue Apr 15 2014 Adam Jackson <ajax@redhat.com> 10.1-6.20140305
- Disable DRI3 in F20, it requires libxcb bits we haven't backported.

View File

@ -1 +1 @@
242b9395d6b0303ddcd88987a93f5e8c mesa-20140305.tar.xz
53e96c430057c768545a8ff2da900402 mesa-20140419.tar.xz