[libAfterImage/el6/master: 4/4] Merge branch 'master' into el6

[Andreas Bierfert]

commit fd344ef41c31f33a0ba8f68fcd1b19f45bc3f80f
Merge: 6a8eddb 49e9b06
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Feb 8 17:12:32 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore              |    2 +-
 libAfterImage-glx.patch |   14 --------------
 libAfterImage.spec      |   17 ++++++++++-------
 sources                 |    2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index a4db29c,a785c9a..5002304
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--libAfterImage-1.18.tar.bz2
 -/libAfterImage-1.20.tar.bz2
++libAfterImage-1.20.tar.bz2