diff options
| author | unknown | 2014-05-25 17:49:07 +0200 |
|---|---|---|
| committer | unknown | 2014-05-25 17:49:07 +0200 |
| commit | b0b65eca6b6600a57d71c5f63f8e5a066e6accd7 (patch) | |
| tree | 21b55c6f7ff2c60401ede9f369738b2ae2d5f77f /Dozentenmodul/src/models/Client.java | |
| parent | links + encoding (diff) | |
| parent | Freigabe Mechanismus implementiert, nun sollte die notwendige Grundlage für d... (diff) | |
| download | tutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.tar.gz tutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.tar.xz tutor-module-b0b65eca6b6600a57d71c5f63f8e5a066e6accd7.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
Dozentenmodul/bin/gui/image/SearchImage_GUI.class
Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
Dozentenmodul/src/models/Links.java
Diffstat (limited to 'Dozentenmodul/src/models/Client.java')
| -rw-r--r-- | Dozentenmodul/src/models/Client.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java index 6dc587f1..42eccdec 100644 --- a/Dozentenmodul/src/models/Client.java +++ b/Dozentenmodul/src/models/Client.java @@ -3,7 +3,6 @@ package models; public class Client { private server.Server.Client client; - public static Client clientcon=new Client(); public server.Server.Client getClient() { |