summaryrefslogtreecommitdiffstats
path: root/Dozentenmodulserver/src
diff options
context:
space:
mode:
authorunknown2014-04-14 16:07:31 +0200
committerunknown2014-04-14 16:07:31 +0200
commitc303590f13bd3f624d18ca427dc0257ceadc7572 (patch)
tree96e6fb9a744455d6f10c29cd4faf58bad30ecd77 /Dozentenmodulserver/src
parenttesttttt (diff)
parentGUI-Texte angepasst (diff)
downloadtutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.tar.gz
tutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.tar.xz
tutor-module-c303590f13bd3f624d18ca427dc0257ceadc7572.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
Diffstat (limited to 'Dozentenmodulserver/src')
0 files changed, 0 insertions, 0 deletions