diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-23 12:00:38 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-01-23 12:00:38 +0100 |
| commit | 2195b00332cc6cba95f9ebec67dfdb230ee600f8 (patch) | |
| tree | 66087939c3921bf3015131f55941791e02622161 /id/server/stork2-commons/src/main/resources/.svn/entries | |
| parent | 38ae8cb883ab73603f490d62b4cac38c51ac43e1 (diff) | |
| parent | d6637f8e82b41936b962f2197dee8cf89d0fe0b9 (diff) | |
| download | moa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.tar.gz moa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.tar.bz2 moa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.zip | |
Merge STORK2 code into development branch
Diffstat (limited to 'id/server/stork2-commons/src/main/resources/.svn/entries')
| -rw-r--r-- | id/server/stork2-commons/src/main/resources/.svn/entries | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries index 3cafa50cf..e8296f4cd 100644 --- a/id/server/stork2-commons/src/main/resources/.svn/entries +++ b/id/server/stork2-commons/src/main/resources/.svn/entries @@ -26,17 +26,17 @@ emrepisja aa842e49-f825-43fc-93ba-11ee9fd5a035 -log4j.xml +StorkcomplexAttributes.xsd file - -2013-12-20T12:27:56.554475Z -aa8c46e41a236b8c7049713b3eeecc49 -2013-07-25T08:54:09.995385Z -7 -emsomavmi +delete +2014-03-05T09:36:07.834515Z +312be97fd22ecb2f274bf9fdebd85b29 +2014-03-04T14:10:03.192908Z +721 +emrepisja @@ -58,19 +58,19 @@ emsomavmi -660 +10938 -StorkcomplexAttributes.xsd +log4j.xml file -2014-03-05T09:36:07.834515Z -312be97fd22ecb2f274bf9fdebd85b29 -2014-03-04T14:10:03.192908Z -721 -emrepisja +2013-12-20T12:27:56.554475Z +aa8c46e41a236b8c7049713b3eeecc49 +2013-07-25T08:54:09.995385Z +7 +emsomavmi @@ -92,5 +92,5 @@ emrepisja -10938 +660 |