Merge branch 'mychanges' of https://github.com/niklwors/OMCompiler in… · OpenModelica/OpenModelica@4d60001 · GitHub

Commit

Merge branch 'mychanges' of https://github.com/niklwors/OMCompiler in…

Browse files

…to mychanges

Conflicts:
	SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt

Loading branch information

niklwors committed Apr 27, 2016

2 parents 7ee20e6 + 08d59fb commit 4d60001