diff options
| author | Stephan Schwaer | 2015-07-09 16:33:29 +0200 |
|---|---|---|
| committer | Stephan Schwaer | 2015-07-09 16:33:29 +0200 |
| commit | 15727be8b551f7eecd597656b592622b825642f6 (patch) | |
| tree | c0247007051be4cc3701eb93deb6c0691737d212 /dozentenmodulserver/src/main/java | |
| parent | [client] Added comments and improved readability of code. (diff) | |
| parent | [client] fixed buttons of disclaimer/vmware license (diff) | |
| download | tutor-module-15727be8b551f7eecd597656b592622b825642f6.tar.gz tutor-module-15727be8b551f7eecd597656b592622b825642f6.tar.xz tutor-module-15727be8b551f7eecd597656b592622b825642f6.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Conflicts:
dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
Diffstat (limited to 'dozentenmodulserver/src/main/java')
0 files changed, 0 insertions, 0 deletions