[xlockmore/el6: 12/12] Merge branch 'master' into el6

[Adrian Reber]

commit 93b3318a06a599ad626f1e72ef5cf66b3be7a555
Merge: 39f83a2 fc2570a
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Oct 18 21:57:19 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                |    5 +++-
 patch-modes_dclock.patch  |   53 +++++++++++++++++++++++++++++++++++++++++++++
 sources                   |    2 +-
 xlockmore-fix_petri.patch |   11 ---------
 xlockmore.spec            |   45 +++++++++++++++++++++++++++++--------
 5 files changed, 93 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index a3e37fa,2e9529e..b5ed533
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,4 @@@
--xlockmore-5.28.tar.bz2
+ /xlockmore-5.31.tar.bz2
+ /xlockmore-5.34.tar.bz2
+ /xlockmore-5.38.tar.bz2
+ /xlockmore-5.40.tar.bz2