e7dc6644c7171efdd92f8876881386f02450b03b
Conflicts: companion/src/CMakeLists.txt companion/src/main.cpp companion/src/modeledit.cpp companion/src/xsimulatordialog.cpp
[to be written]
Languages
C
71.9%
C++
25.4%
Python
0.9%
CMake
0.6%
Shell
0.3%
Other
0.7%