Skip to content
Commit 753ae09d authored by Björn Richerzhagen's avatar Björn Richerzhagen
Browse files

Merge remote-tracking branch 'origin/m_stein/master-A1' into 

br/a1-master-merge

Conflicts:
	pom.xml
	src/de/tudarmstadt/maki/simonstrator/api/component/sis/type/SiSTypes.java
parents f6e37288 71cab85f
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