commit e06c25ad8a9f83ea93cb74d7b41368a728ad3c53
Merge: 2079aac 1fbb2c5
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Thu Jun 30 21:59:18 2011 +0200
Merge branch 'master' into el6
Conflicts:
gridsite.spec
.gitignore | 3 +
...location.patch => cgi-bin-location-1.5.20.patch | 0
...location.patch => cgi-bin-location-1.7.15.patch | 13 ++-
gridsite-include-1.5.20.patch | 60 +++++++++++
gridsite-include-1.7.9.patch | 62 -----------
gridsite.spec | 113 +++++++++++++++++---
sources | 3 +-
7 files changed, 172 insertions(+), 82 deletions(-)
---
diff --cc .gitignore
index 74c8058,330fb75..be0d1d0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,6 +1,5 @@@
-gridsite-1.5.18.src.tar.gz
/gridsite-1.5.19.src.tar.gz
/gridsite-1.7.9.src.tar.gz
+ /gridsite-1.7.12.src.tar.gz
+ /gridsite-1.7.13.src.tar.gz
+ /gridsite-1.7.15.src.tar.gz
Show replies by date