projects / moonshot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e512b30 b52fd07)
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Tue, 19 Oct 2010 12:08:57 +0000 (23:08 +1100)
committerLuke Howard <lukeh@padl.com>
Tue, 19 Oct 2010 12:08:57 +0000 (23:08 +1100)
Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling

1  2 
shibboleth/sp patch | diff1 | diff2 | blob | history
shibboleth/xmltooling patch | blob1 | blob2 | history

diff --cc shibboleth/sp
index 776a369,f10cb35..ea4aec5
--- 1/shibboleth/sp
--- 2/shibboleth/sp
+++ b/shibboleth/sp
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 776a36978608977402269c5aeab9d27dae73a385
 -Subproject commit f10cb3582dcc80c593198a27ab48db583327d7de
++Subproject commit ea4aec55a31d84e6c0cf86759032681d465da66e
diff --cc shibboleth/xmltooling
index 91caea7,21ecbfb..0000000
deleted file mode 160000,160000
--- 1/shibboleth/xmltooling
--- 2/shibboleth/xmltooling
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 91caea7b06b517e7cf46e83d624d1f49ed3432fa
 -Subproject commit 21ecbfb331400c6acb087b809dfa07dc20d5a6fb
Core Moonshot code including mech_eap