diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-04 20:23:15 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-03-04 20:23:15 +0100 |
| commit | 6cddcc22ff639efb12bf3052588fde3a326e5fdc (patch) | |
| tree | 58be11f2a24df2f660d543d70530817d798910a1 /id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops | |
| parent | 55885d24e176c92b97af233796189c8b2cc88808 (diff) | |
| parent | a0d2ea64de1589b7f808240390ecb39309ed2a44 (diff) | |
| download | moa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.tar.gz moa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.tar.bz2 moa-id-spss-6cddcc22ff639efb12bf3052588fde3a326e5fdc.zip | |
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts:
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/DataContainer.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
Diffstat (limited to 'id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops')
| -rw-r--r-- | id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops new file mode 100644 index 000000000..3cd5d5378 --- /dev/null +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops @@ -0,0 +1,41 @@ +K 25 +svn:wc:ra_dav:version-url +V 87 +/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific +END +IDeriveAttribute.java +K 25 +svn:wc:ra_dav:version-url +V 108 +/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java +END +IAUService.java +K 25 +svn:wc:ra_dav:version-url +V 103 +/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java +END +INormaliseValue.java +K 25 +svn:wc:ra_dav:version-url +V 107 +/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java +END +ITranslatorService.java +K 25 +svn:wc:ra_dav:version-url +V 111 +/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java +END +package-info.java +K 25 +svn:wc:ra_dav:version-url +V 104 +/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/package-info.java +END +ICheckAttributeValue.java +K 25 +svn:wc:ra_dav:version-url +V 112 +/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java +END |