commit 5cae3fbd2e36ce0fc0fb155c4e6df0db50435eed
Merge: d94f3e0 1fbb2c5
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Thu Jun 30 22:01:04 2011 +0200
Merge branch 'master' into el5
Conflicts:
gridsite.spec
.gitignore | 4 +
...location.patch => cgi-bin-location-1.5.20.patch | 0
...location.patch => cgi-bin-location-1.7.15.patch | 13 +-
...-include.patch => gridsite-include-1.5.20.patch | 0
gridsite.spec | 130 ++++++++++++++++++--
sources | 3 +-
6 files changed, 132 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index 5d18c6a,330fb75..be0d1d0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -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