Kristina Jurisic ef6507744c Resolved merge conflicts

2021-06-28 10:21:47 +02:00

..

_Config

Change some variable names, add bPermit

2021-06-27 11:54:44 +02:00

Licenses

Normalize all line endings to LF in the repo

2019-12-04 16:30:58 +01:00

tc_project_app

Resolved merge conflicts

2021-06-28 10:21:47 +02:00

solution.tsproj

Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators

2021-06-15 11:30:39 +02:00