diff --git a/CHANGELOG b/CHANGELOG index 0fe1874..f6310d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,28 @@ +commit ea1fefc219017856df6bf3c1f79b596213c97403 +Merge: 6e0ebcd 3d2c162 +Author: Roeland Jansen +Date: Tue Feb 7 18:52:37 2023 +0100 + + Merge branch 'wf-fix' + +commit 3d2c16201be5fa6a92f2931cfad754cee48448a1 +Author: Phil Taylor +Date: Tue Feb 7 17:51:52 2023 +0000 + + Fix invalid scope data in combine mode + +commit 6e0ebcdd5a109695ca95da5cb41bb13d6e08ac79 +Author: Roeland Jansen +Date: Tue Feb 7 18:20:18 2023 +0100 + + removed empty file + +commit 2488d62f2e429e1607fc12966db8d4f03312ad7f +Author: Roeland Jansen +Date: Tue Feb 7 18:17:57 2023 +0100 + + fixes stuff after 1.60 release + commit 40f49c56e7553ca907c533b5d0fe5f277a1420f3 Author: Phil Taylor Date: Tue Feb 7 17:11:53 2023 +0000 diff --git a/WHATSNEW b/WHATSNEW index 4f82c3b..8d4fd12 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -65,6 +65,8 @@ The following highlights are in this 1.51-release ince v1.50: Added "scope out of range" notification. many fixes added a known limitations and issues file. ++1.60 released ++1.61 many small fixes for several platforms. Notes: diff --git a/wfserver.pro b/wfserver.pro index d123788..5f94f35 100644 --- a/wfserver.pro +++ b/wfserver.pro @@ -13,7 +13,7 @@ TEMPLATE = app CONFIG += console -DEFINES += WFVIEW_VERSION=\\\"1.60\\\" +DEFINES += WFVIEW_VERSION=\\\"1.61\\\" DEFINES += BUILD_WFSERVER diff --git a/wfview.pro b/wfview.pro index fb3f2df..704e091 100644 --- a/wfview.pro +++ b/wfview.pro @@ -21,7 +21,7 @@ contains(DEFINES,USB_CONTROLLER){ TARGET = wfview TEMPLATE = app -DEFINES += WFVIEW_VERSION=\\\"1.60\\\" +DEFINES += WFVIEW_VERSION=\\\"1.61\\\" DEFINES += BUILD_WFVIEW