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 /spss/server/moa-spss.iml | |
| 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 'spss/server/moa-spss.iml')
| -rw-r--r-- | spss/server/moa-spss.iml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spss/server/moa-spss.iml b/spss/server/moa-spss.iml index 567359474..6e02e5944 100644 --- a/spss/server/moa-spss.iml +++ b/spss/server/moa-spss.iml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../target/classes" /> - <output-test url="file://$MODULE_DIR$/../target/test-classes" /> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" /> </component> </module> |