diff options
| author | Simon Rettberg | 2015-07-09 12:36:37 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-07-09 12:36:37 +0200 |
| commit | 06b5236c58dde31bbc910a644aa2c676197ca2a8 (patch) | |
| tree | 9b94b474cf34e25b73a5d092b945dd37e0973977 /dozentenmodulserver/src/main/java | |
| parent | [client] Clean up login, implement showMessageBox, fix formatting (diff) | |
| parent | [client] GuiManager.openPopup first steps (diff) | |
| download | tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.tar.gz tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.tar.xz tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Conflicts:
dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GuiManager.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
(Hopefully resolved)
Diffstat (limited to 'dozentenmodulserver/src/main/java')
0 files changed, 0 insertions, 0 deletions