summaryrefslogtreecommitdiffstats
path: root/Dozentenmodulserver
diff options
context:
space:
mode:
authorTobias Spitzer2014-08-22 10:04:47 +0200
committerTobias Spitzer2014-08-22 10:04:47 +0200
commitf1ae15cabfb0efdbefee91f889fffdcaa04b1574 (patch)
tree96d4b896c1307450d651d133ca295387fb174905 /Dozentenmodulserver
parentNeue Suchfenster (diff)
parentZahlen sind im Imagenamen erlaubt (diff)
downloadtutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.tar.gz
tutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.tar.xz
tutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Dozentenmodul/bin/gui/image/SearchImage_GUI.class fds
Diffstat (limited to 'Dozentenmodulserver')
-rw-r--r--Dozentenmodulserver/bin/util/XMLCreator.classbin7564 -> 7561 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class
index 04ba5197..6d7673fb 100644
--- a/Dozentenmodulserver/bin/util/XMLCreator.class
+++ b/Dozentenmodulserver/bin/util/XMLCreator.class
Binary files differ