Merge remote-tracking branch 'server/master' into tracapi

Conflicts:
	java/com.tractrac.clientmodule/.classpath
This commit is contained in:
Axel Uhl committed 2014-02-10 18:22:55 +01:00
commit 42e2435c6c
21 files changed
+704 -398

No files matched your search

@@ -6,7 +6,6 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>