mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-31 13:10:19 -04:00 
			
		
		
		
	Merge branch 'develop' into feat-ft8-q3
This commit is contained in:
		
						commit
						a3dedc81de
					
				| @ -45,7 +45,7 @@ if (POLICY CMP0075) | |||||||
| endif () | endif () | ||||||
| 
 | 
 | ||||||
| project (wsjtx | project (wsjtx | ||||||
|   VERSION 2.5.4.0 |   VERSION 2.6.0 | ||||||
|   LANGUAGES C CXX Fortran |   LANGUAGES C CXX Fortran | ||||||
|   ) |   ) | ||||||
| set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") | set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") | ||||||
| @ -71,7 +71,7 @@ message (STATUS "******************************************************") | |||||||
| 
 | 
 | ||||||
| include (set_build_type) | include (set_build_type) | ||||||
| # RC 0 or omitted is a development build, GA is a General Availability release build | # RC 0 or omitted is a development build, GA is a General Availability release build | ||||||
| set_build_type (GA) | set_build_type (RC 1) | ||||||
| set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") | set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") | ||||||
| 
 | 
 | ||||||
| # | # | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user