diff options
author | unknown | 2014-04-04 11:58:26 +0200 |
---|---|---|
committer | unknown | 2014-04-04 11:58:26 +0200 |
commit | 5a1064c6102ed248ca702691ea4993f916944e95 (patch) | |
tree | 368c62c904954489f9c449717f7c964343933ae2 /Dozentenmodul/bin/gui/MainMenue_GUI$12.class | |
parent | test (diff) | |
parent | Sämtliche Bugs behoben (diff) | |
download | tutor-module-5a1064c6102ed248ca702691ea4993f916944e95.tar.gz tutor-module-5a1064c6102ed248ca702691ea4993f916944e95.tar.xz tutor-module-5a1064c6102ed248ca702691ea4993f916944e95.zip |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java
Diffstat (limited to 'Dozentenmodul/bin/gui/MainMenue_GUI$12.class')
0 files changed, 0 insertions, 0 deletions