[myproxy/el5: 11/11] Merge branch 'master' into el5
stevetraylen
stevetraylen at fedoraproject.org
Wed Aug 31 04:51:28 UTC 2011
commit 07ba57ba4c6aaf9a7bded1050655323ae2365764
Merge: dca3b75 484edc9
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Wed Aug 31 06:51:08 2011 +0200
Merge branch 'master' into el5
.gitignore | 1 +
myproxy-globus-7129.patch | 110 +++++++++++++++++++++++++++++++++++++++++++
myproxy-vomsc-vomsapi.patch | 12 -----
myproxy.spec | 93 ++++++++++++++++++++++--------------
sources | 2 +-
5 files changed, 168 insertions(+), 50 deletions(-)
---
diff --cc .gitignore
index 0010d07,6776360..a6f74ec
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
-myproxy-5.2.tar.gz
/myproxy-5.3.tar.gz
+ /myproxy-5.4.tar.gz
More information about the scm-commits
mailing list