[waffle/epel7: 2/3] Merge branch 'master' into f21

[Matej Cepl]

commit a4f65b8d3786f7d6a13fe7abad504e7e087de792
Merge: ed03acd 68d343f
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Thu Dec 4 08:51:40 2014 +0100

    Merge branch 'master' into f21
    
    Conflicts:
    	waffle.spec

 .gitignore  |    2 ++
 sources     |    2 +-
 waffle.spec |   19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --cc waffle.spec
index 9ec9d20,74f9c5b..319a274
--- a/waffle.spec
+++ b/waffle.spec
@@@ -5,8 -5,8 +5,8 @@@
  %endif
  
  Name:          waffle
- Version:       1.3.0
- Release:       5%{?dist}
+ Version:       1.4.2
 -Release:       1%{?dist}
++Release:       2%{?dist}
  Summary:       Platform independent GL API layer
  
  Group:         Development/Libraries
@@@ -115,9 -113,12 +115,18 @@@ install -p examples/{gl_basic,simple-x1
  
  
  %changelog
- * Mon Sep 29 2014 Matej Cepl <mcepl at redhat.com> - 1.3.0-5
++* Thu Dec 04 2014 Matej Cepl <mcepl at redhat.com> - 1.4.2-2
++- Merge with master.
++
+ * Thu Dec 04 2014 Matej Cepl <mcepl at redhat.com> - 1.4.2-1
+ - Upstream release (#1161826)
+ 
+ * Tue Sep 23 2014 Matěj Cepl <mcepl at redhat.com> - 1.4.0-1
+ - Upgreade to the latest upstream release (RHBZ# 1145481)
+ 
++* Tue Sep 23 2014 Matej Cepl <mcepl at redhat.com> - 1.3.0-5
 +- Apply patch to make GBM work on f21 as well.
 +
  * Tue Sep 23 2014 Matěj Cepl <mcepl at redhat.com> - 1.3.0-4
  - Enable GBM and Wayland options as well.