projects / shibboleth / sp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e481c 8cfb88b)
Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:04:41 +0000 (17:04 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:04:41 +0000 (17:04 -0700)
1  2 
configs/Makefile.in patch | diff1 | diff2 | blob | history
configs/keygen.sh patch | diff1 | diff2 | blob | history

diff --cc configs/Makefile.in
Simple merge
diff --cc configs/keygen.sh
Simple merge
Shibboleth SP