diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2012-04-30 19:46:33 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2012-04-30 19:46:33 +0200 |
commit | 178c3359edcad839dfc5082d539fc5df013d3ee8 (patch) | |
tree | 7dcd55c8e8e56ed163263798b9fba93fe01683f2 /client-data | |
parent | 19eb2044ab5e93ade67bc670950290ce7bbd7bad (diff) | |
download | serverdata-178c3359edcad839dfc5082d539fc5df013d3ee8.tar.gz serverdata-178c3359edcad839dfc5082d539fc5df013d3ee8.tar.bz2 serverdata-178c3359edcad839dfc5082d539fc5df013d3ee8.tar.xz serverdata-178c3359edcad839dfc5082d539fc5df013d3ee8.zip |
Collision of 034-1 fixed. Converter ran, submodule pointer updated.
Diffstat (limited to 'client-data')
m--------- | client-data | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/client-data b/client-data -Subproject b85c626bc06b2e290d7993607463e31ceb25fd0 +Subproject d1bbb6c049e82cb718b900ba7db9af01ad52c19 |