aboutsummaryrefslogtreecommitdiff
path: root/build.bat
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-02-18 13:47:14 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-02-18 13:47:14 +0100
commitbf086cff8ef680b73ca0300147c3c3b70ab32ae0 (patch)
tree1174cdc916982f5f879cde1fc587147a7dced63d /build.bat
parent570527d48e3bf03444cdda08a4c1bcf8e7d4ff42 (diff)
parent271e22add71f0260f5d421844a2171a09093f505 (diff)
downloadmoa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.gz
moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.bz2
moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.zip
Merge branch 'datentechnik_modularization' into moa-id-2.2-merge
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java id/server/stork2-commons/pom.xml id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries id/server/stork2-commons/src/main/resources/.svn/entries id/server/stork2-saml-engine/pom.xml pom.xml
Diffstat (limited to 'build.bat')
0 files changed, 0 insertions, 0 deletions