diff options
| author | Michael Wilson | 2014-08-25 17:50:38 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-08-25 17:50:38 +0200 |
| commit | 7c08e2fb5958666edabdd46ea5665be04577fe6d (patch) | |
| tree | 365e0b859d640dd69c0ea72d9ea31bacadea45da /Dozentenmodul/bin | |
| parent | Verhindere unerlaubtes zurückgehen auf vorige Seite während Up-DOwnloads (diff) | |
| parent | Letzter Down- und Uploadpfad werden nun in die Konfig geschrieben (diff) | |
| download | tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.tar.gz tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.tar.xz tutor-module-7c08e2fb5958666edabdd46ea5665be04577fe6d.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/ftp/DownloadTask.class
Dozentenmodul/bin/ftp/UploadTask.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
Diffstat (limited to 'Dozentenmodul/bin')
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class | bin | 14690 -> 14732 bytes |
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class | bin | 13566 -> 14312 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex 46d3a6ab..dca17047 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex a9e27d2f..0e5c8340 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class |