diff --git a/CMakeLists.txt b/CMakeLists.txt index b9934114..c40c9256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 1) set(DS_VERSION_MINOR 3) set(DS_VERSION_MICRO 0) -set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}-RC10 ) +set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) configure_file ( ${PROJECT_SOURCE_DIR}/DSView/config.h.in diff --git a/DSView/config.h b/DSView/config.h index 07d7087b..a377444c 100644 --- a/DSView/config.h +++ b/DSView/config.h @@ -30,6 +30,6 @@ #define DS_VERSION_MAJOR 1 #define DS_VERSION_MINOR 3 #define DS_VERSION_MICRO 0 -#define DS_VERSION_STRING "1.3.0-RC10" +#define DS_VERSION_STRING "1.3.0" #endif diff --git a/NEWS25 b/NEWS25 index 94b6646e..cc51badb 100644 --- a/NEWS25 +++ b/NEWS25 @@ -1,4 +1,4 @@ -v1.3.0-RC10 -- (2023-07-08) +v1.3.0 -- (2023-07-18) ---------- (通用) *改进设备管理的实现,解耦和波形采集显示的绑定 diff --git a/NEWS31 b/NEWS31 index cafff99e..db7c84f7 100644 --- a/NEWS31 +++ b/NEWS31 @@ -1,4 +1,4 @@ -v1.3.0-RC10 -- (2023-07-08) +v1.3.0 -- (2023-07-18) ---------- --common * Improve device management, decouple it from wave acquisition and display diff --git a/ug25.pdf b/ug25.pdf index d14e0077..cd599bdb 100644 Binary files a/ug25.pdf and b/ug25.pdf differ diff --git a/ug31.pdf b/ug31.pdf index 5198792f..84e26553 100644 Binary files a/ug31.pdf and b/ug31.pdf differ