aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:27:55 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:27:55 +0100
commitd828b0b377a1bd61a04f0886c9d24aa1eb19c025 (patch)
treeac7f578e5cf6f4840eb5c6f662b3b6cf96a6a40e /id/server/stork2-commons/src/main/resources/.svn/all-wcprops
parent0499a41a86a6b44092eb6ad356858cd36a3d19c0 (diff)
parent19e164874ea92d51f9df12f56047d77db9683091 (diff)
downloadmoa-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/resources/.svn/all-wcprops')
-rw-r--r--id/server/stork2-commons/src/main/resources/.svn/all-wcprops11
1 files changed, 11 insertions, 0 deletions
diff --git a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
new file mode 100644
index 000000000..48074222b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources
+END
+log4j.xml
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml
+END