summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-08-12 17:44:47 +0200
committerJonathan Bauer2014-08-12 17:44:47 +0200
commitf22414d79d4860ba2d546ff74b6f7e91d3b5ed26 (patch)
treec829d37c7e55f0a8293178661fe800174ca2649b
parent[win32] fix problems with org.eclipse.swt package names and version (diff)
parentMoved new source files to proper subdir (diff)
downloadtutor-module-f22414d79d4860ba2d546ff74b6f7e91d3b5ed26.tar.gz
tutor-module-f22414d79d4860ba2d546ff74b6f7e91d3b5ed26.tar.xz
tutor-module-f22414d79d4860ba2d546ff74b6f7e91d3b5ed26.zip
Merge branch 'maven' of git.openslx.org:openslx-ng/tutor-module into maven
-rw-r--r--Dozentenmodul/src/main/java/gui/image/ExtendedSearchForImages_GUI.java (renamed from Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java)0
-rw-r--r--Dozentenmodul/src/main/java/gui/image/PermissionImage_GUI.java (renamed from Dozentenmodul/src/gui/image/PermissionImage_GUI.java)0
-rw-r--r--Dozentenmodul/src/main/java/models/Search.java (renamed from Dozentenmodul/src/models/Search.java)0
3 files changed, 0 insertions, 0 deletions
diff --git a/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/main/java/gui/image/ExtendedSearchForImages_GUI.java
index 872e8f8d..872e8f8d 100644
--- a/Dozentenmodul/src/gui/image/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/ExtendedSearchForImages_GUI.java
diff --git a/Dozentenmodul/src/gui/image/PermissionImage_GUI.java b/Dozentenmodul/src/main/java/gui/image/PermissionImage_GUI.java
index 43b5eb48..43b5eb48 100644
--- a/Dozentenmodul/src/gui/image/PermissionImage_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/image/PermissionImage_GUI.java
diff --git a/Dozentenmodul/src/models/Search.java b/Dozentenmodul/src/main/java/models/Search.java
index 59a28b21..59a28b21 100644
--- a/Dozentenmodul/src/models/Search.java
+++ b/Dozentenmodul/src/main/java/models/Search.java