Conflicts: libsrc/leddevice/CMakeLists.txt libsrc/leddevice/LedDeviceFactory.cpp test/TestRs232HighSpeed.cpp Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7 |
||
---|---|---|
.. | ||
getoptPlusPlus | ||
hidapi | ||
jsoncpp | ||
serial | ||
CMakeLists.txt |
Conflicts: libsrc/leddevice/CMakeLists.txt libsrc/leddevice/LedDeviceFactory.cpp test/TestRs232HighSpeed.cpp Former-commit-id: 5583f2f881afd1a9b0c8ec3a52d7d3b54fe1dff7 |
||
---|---|---|
.. | ||
getoptPlusPlus | ||
hidapi | ||
jsoncpp | ||
serial | ||
CMakeLists.txt |