Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class

1 files changed, 11 insertions, 0 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 681a9a7c..c7ab500b 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -304,4 +304,15 @@ public class ServerHandler implements Server.Iface {
 		return null;
 	}
 
+
+	@Override
+	public boolean updateLecturedata(String name, String newName,
+			String shortdesc, String desc, String startDate, String endDate,
+			boolean isActive, String imagename, String firstname,
+			String lastname, String university, String Mail, String Tel,
+			String Fak, String id) throws TException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }