aboutsummaryrefslogtreecommitdiff
path: root/repository/org/xerial
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-01-29 16:39:18 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-01-29 16:39:18 +0100
commitaa8ef6ac6e9f27cde7d009006de639893e0851f3 (patch)
tree9aa2d9b209738d42fc5560e10a1c8b11892df42c /repository/org/xerial
parent648510a0769be3ebc4dc3d2e454172d230d3f217 (diff)
parent5ab7e548582a26dd37144df55efb63b7fca4483d (diff)
downloadmoa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.tar.gz
moa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.tar.bz2
moa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.zip
Merge remote-tracking branch 'remotes/origin/moa2_0_kstranacher' into moa2_0_tlenz
Conflicts: common/pom.xml id/server/auth/.settings/org.eclipse.wst.common.component id/server/auth/src/main/webapp/index.html id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl pom.xml spss/handbook/clients/api/pom.xml spss/handbook/clients/pom.xml spss/handbook/clients/referencedData/pom.xml spss/handbook/clients/webservice/pom.xml spss/handbook/pom.xml spss/pom.xml spss/server/pom.xml spss/server/serverlib/pom.xml spss/server/serverws/.settings/org.eclipse.wst.common.component spss/server/serverws/pom.xml spss/server/tools/pom.xml
Diffstat (limited to 'repository/org/xerial')
0 files changed, 0 insertions, 0 deletions