Merge branch 'master' into f20

3 files changed, 8 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 72c37ac..5dd8577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ mesa-20100720.tar.bz2
 /mesa-20140225.tar.xz
 /mesa-20140301.tar.xz
 /mesa-20140305.tar.xz
+/mesa-20140419.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 3677a6a..e009b1f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -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.
 
diff --git a/sources b/sources
index ac044ff..cd59d77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-242b9395d6b0303ddcd88987a93f5e8c  mesa-20140305.tar.xz
+53e96c430057c768545a8ff2da900402  mesa-20140419.tar.xz