aboutsummaryrefslogtreecommitdiff
path: root/MOA.iml
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-26 16:36:18 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-26 16:36:18 +0100
commit0e38238f9e08b59d3feb47a38b172f82d7f90c64 (patch)
tree364a9fec31011c94031b3e33395ee64e2deb4fba /MOA.iml
parentcaee81b311e93720d4c1fe2b3de22cdcbb0fe74d (diff)
parente9825935e59a3e7855060531f228177aded5cb0a (diff)
downloadmoa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.tar.gz
moa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.tar.bz2
moa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.zip
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
Diffstat (limited to 'MOA.iml')
0 files changed, 0 insertions, 0 deletions