Merge branch 'develop' into feature/yubikey

This commit is contained in:
Janek Bevendorff 2017-01-15 03:20:21 +02:00 committed by GitHub
commit e17576a6f7
30 changed files with 314 additions and 126 deletions

View file

@ -15,7 +15,7 @@
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo Debug Debugfull Profile MinSizeRel."
"Choose the type of build, options are: None Debug Release RelWithDebInfo Debug DebugFull Profile MinSizeRel."
FORCE)
endif()