Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2019-04-05 19:26:42 +02:00
23 changed files with 579 additions and 198 deletions

View File

@@ -102,6 +102,7 @@ set(SOURCES
"simulationstateserializer.cpp"
"precipitation.cpp"
"openglcolor.cpp"
"dictionary.cpp"
"imgui/imgui.cpp"
"imgui/imgui_demo.cpp"