Skip to content
Commit 9f99f93c authored by Marc Schiller's avatar Marc Schiller
Browse files

Merge branch 'ms/sis-loadgen' into ms/sis-requests 

# Conflicts:
#	src/de/tudarmstadt/maki/simonstrator/api/component/sis/SiSInfoProperties.java
#	src/de/tudarmstadt/maki/simonstrator/api/component/sis/SiSRequest.java
parents dd5617f2 e87fe161
Hide whitespace changes
Inline Side-by-side
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