Commit Graph

6 Commits

Author SHA1 Message Date
f81c9d7ecc resolved merge conflicts 2020-12-10 16:36:09 +01:00
14e254141c Merge remote-tracking branch 'upstream/development' into mueller/thermal-update 2020-12-10 16:30:21 +01:00
64cf0d0a70 thermal update 2020-12-03 18:32:32 +01:00
790d3f1465 taken over all changes 2020-09-06 15:25:56 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +02:00
575f70ba03 updating code from Flying Laptop
This is the framework of Flying Laptop OBSW version A.13.0.
2018-07-12 16:29:32 +02:00