diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:27:55 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-05 21:27:55 +0100 |
| commit | d828b0b377a1bd61a04f0886c9d24aa1eb19c025 (patch) | |
| tree | ac7f578e5cf6f4840eb5c6f662b3b6cf96a6a40e /id/server/stork2-commons/src/main/java/.svn | |
| parent | 0499a41a86a6b44092eb6ad356858cd36a3d19c0 (diff) | |
| parent | 19e164874ea92d51f9df12f56047d77db9683091 (diff) | |
| download | moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.gz moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.bz2 moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.zip | |
Merge branch 'moa2_0_tlenz_bs_3' into moa2_0_tlenz_bs_3_ar
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
Diffstat (limited to 'id/server/stork2-commons/src/main/java/.svn')
| -rw-r--r-- | id/server/stork2-commons/src/main/java/.svn/all-wcprops | 5 | ||||
| -rw-r--r-- | id/server/stork2-commons/src/main/java/.svn/entries | 31 |
2 files changed, 36 insertions, 0 deletions
diff --git a/id/server/stork2-commons/src/main/java/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/.svn/all-wcprops new file mode 100644 index 000000000..a1df0322e --- /dev/null +++ b/id/server/stork2-commons/src/main/java/.svn/all-wcprops @@ -0,0 +1,5 @@ +K 25 +svn:wc:ra_dav:version-url +V 59 +/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java +END diff --git a/id/server/stork2-commons/src/main/java/.svn/entries b/id/server/stork2-commons/src/main/java/.svn/entries new file mode 100644 index 000000000..9ee5924fb --- /dev/null +++ b/id/server/stork2-commons/src/main/java/.svn/entries @@ -0,0 +1,31 @@ +10 + +dir +665 +https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java +https://webgate.ec.europa.eu/CITnet/svn/STORK2 + + + +2014-01-15T09:44:59.969756Z +484 +emsomavmi + + + + + + + + + + + + + + +aa842e49-f825-43fc-93ba-11ee9fd5a035 + +eu +dir + |