Skip to content
Snippets Groups Projects
Commit 0bd32903 authored by Nelson Tavares de Sousa's avatar Nelson Tavares de Sousa
Browse files

Merge branch 'master' of build.se.informatik.uni-kiel.de:chw/teetime 

Conflicts:
	src/main/java/teetime/framework/pipe/PipeFactory.java
parents 81420e90 7c362201
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 8 deletions
.classpath
+ 8
− 8
View file @ 0bd32903
...@@ -6,25 +6,25 @@ ...@@ -6,25 +6,25 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="conf"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/performancetest/java"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="src" path="src/performancetest/java"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="conf"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
results/blade2/Kieker.csv → experiments/results/blade2/Kieker.csv
+ 0
− 0
View file @ 0bd32903
File moved
results/blade2/TeeTime.csv → experiments/results/blade2/TeeTime.csv
+ 0
− 0
View file @ 0bd32903
File moved
results/evaluation.xlsx → experiments/results/evaluation.xlsx
+ 0
− 0
View file @ 0bd32903
File moved
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