Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba

Conflicts:
	src/YalpClients/EflClient/list_test.edc
	src/YalpClients/EflClient/list_test_elem.py

Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>

1 files changed, 40 insertions, 40 deletions

diff --git a/src/YalpServer/YalpServer.java b/src/YalpServer/YalpServer.java
index 8cf57d3..0ddbe00 100755
--- a/src/YalpServer/YalpServer.java
+++ b/src/YalpServer/YalpServer.java
@@ -1,40 +1,40 @@
-/*
- * Copyright (c) 2006 Manuel Traut and Volker Dahnke
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors: Manuel Traut and Volker Dahnke
- */
-package YalpServer;
-
-/*
- * Class Server
- *
- * <em>static main method</em>
- *
- * @author Volker Dahnke / Manuel Traut
- *
- * @version 0.1 20-11-2005<br>
- */
-public class YalpServer{
-
-/*
- *  starts Server initialization
- *
- *  @param argv
- *      arguments which are not used
- */
-	public static void main (String[] argv) {
-		try{
-			System.setProperty("java.security.policy","server.policy");
-		} catch (Exception e) {//DEBUG
-			System.out.println ("Server SecurityManagerExeptions not caught jet " + e);
-			System.exit(0);
-		}
-		InitServer yalpServer = new InitServer(argv);
-		return;
-	}
-
-}
+/*

+ * Copyright (c) 2006 Manuel Traut and Volker Dahnke

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ *

+ * Contributors: Manuel Traut and Volker Dahnke

+ */

+package YalpServer;

+

+/*

+ * Class Server

+ *

+ * <em>static main method</em>

+ *

+ * @author Volker Dahnke / Manuel Traut

+ *

+ * @version 0.1 20-11-2005<br>

+ */

+public class YalpServer{

+

+/*

+ *  starts Server initialization

+ *

+ *  @param argv

+ *      arguments which are not used

+ */

+	public static void main (String[] argv) {

+		try{

+			System.setProperty("java.security.policy","server.policy");

+		} catch (Exception e) {//DEBUG

+			System.out.println ("Server SecurityManagerExeptions not caught jet " + e);

+			System.exit(0);

+		}

+		InitServer yalpServer = new InitServer(argv);

+		return;

+	}

+

+}