aboutsummaryrefslogtreecommitdiff
path: root/CMakeSettings.json
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-10-03 18:09:49 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-10-03 18:09:49 +0200
commit7f7cfeb45b579204e0bc94bea37e2c810d2e5ec9 (patch)
tree4058c41e2460fad253ec0290a56166e46a28bc78 /CMakeSettings.json
parent8f7435e4553916e6cc431e4b5316cc5861fd9063 (diff)
parent7d0d03428f90d3f65452eb7035bb715efec87ac8 (diff)
downloadlibnitrokey-7f7cfeb45b579204e0bc94bea37e2c810d2e5ec9.tar.gz
libnitrokey-7f7cfeb45b579204e0bc94bea37e2c810d2e5ec9.tar.bz2
Merge branch 'OSX_merge_cleaned'
This merge: - fixes issues with invalid mutex - moves tests to Python 3 - allows to compile the code natively under Visual Studio with CMake - allows to compile under QtCreator under MS Windows - fixes some issues with test suite - allows to run tests under Windows - allows to compile using QMake (and easy adding to Qt projects) - decreases delays between sending commands thus increasing 2x communication speed
Diffstat (limited to 'CMakeSettings.json')
0 files changed, 0 insertions, 0 deletions