Merge branch 'master' into el6

2014-01-04 16:06:54 +01:00 · 2013-07-18 21:05:51 +02:00 · 2012-11-20 22:18:15 +01:00 · 2012-10-22 11:20:29 +02:00 · 2012-10-18 21:57:19 +02:00 · 2011-02-28 09:56:32 +01:00
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,3 @@
-xlockmore-5.28.tar.bz2
 /xlockmore-5.31.tar.bz2
 /xlockmore-5.34.tar.bz2
 /xlockmore-5.38.tar.bz2
Author	SHA1	Message	Date
Adrian Reber	fc2b3bd098	Merge branch 'master' into el6	2014-01-04 16:06:54 +01:00
Adrian Reber	ee5b16e12f	Merge branch 'master' into el6	2013-07-18 21:05:51 +02:00
Adrian Reber	c597ab07ab	Merge branch 'master' into el6	2012-11-20 22:18:15 +01:00
Adrian Reber	d142d6a97b	Merge branch 'master' into el6	2012-10-22 11:20:29 +02:00
Adrian Reber	93b3318a06	Merge branch 'master' into el6 Conflicts: .gitignore	2012-10-18 21:57:19 +02:00
Adrian Reber	39f83a2d09	Merge branch 'master' into el6 Conflicts: .gitignore	2011-02-28 09:56:32 +01:00
Fedora Release Engineering	3c329a976a	dist-git conversion	2010-07-29 15:54:49 +00:00
Bill Nottingham	149a061aa5	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:33:59 +00:00
Jesse Keating	dd7b591f9a	Initialize branch F-12 for xlockmore	2009-09-29 07:22:41 +00:00