Merge branch 'develop-khan' into khan-dev

This commit is contained in:
briaguya 2023-03-14 09:45:00 -04:00
commit b2698fa126

View File

@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
project(Ship VERSION 6.1.0 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "KHAN ALFA" CACHE STRING "")
project(Ship VERSION 6.1.1 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "KHAN BRAVO" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)