Commit 8fe3a590 authored by Eric Tobias's avatar Eric Tobias

Merge branch 'dev_cMo' of http://git.list.lu/nui/tulip into dev-nico

Conflicts:
	TULIP/.classpath
	TULIP/libs/libTUIO.jar
	TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java
parents 89539d3d f9e86c54
......@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="lib" path="libs/jdom-2.0.5.jar" sourcepath="libs/jdom-2.0.5-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/TUI%20Framework/libs/jdom-2.0.5-javadoc.jar!/"/>
......
......@@ -496,4 +496,4 @@ public class TuioAdapter extends TuiAdapter implements TuioListener {
public TangibleObject getBlob(long id) {
return convertTuioBlobToTangibleObject(client.getTuioBlob(IDMapper.remapTangibleObjectId((int) id)));
}
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment