diff --git a/.github/workflows/nightly-merge.yml b/.github/workflows/nightly-merge.yml index bfdc248190..c3db9ac7bb 100644 --- a/.github/workflows/nightly-merge.yml +++ b/.github/workflows/nightly-merge.yml @@ -16,7 +16,7 @@ jobs: - name: Nightly Merge uses: robotology/gh-action-nightly-merge@v1.3.3 with: - stable_branch: 'master' + stable_branch: 'yarp-3.10' development_branch: 'master' allow_ff: false user_name: 'robotology-bot' diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e1c80d1a8..ec9557a022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() # Main project project( YARP - VERSION 3.10.0 + VERSION 3.10.1 LANGUAGES C CXX ) set(PROJECT_DESCRIPTION "YARP: A thin middleware for humanoid robots and more") diff --git a/COPYING b/COPYING index 6a3a8e0e88..606e87b283 100644 --- a/COPYING +++ b/COPYING @@ -128,9 +128,9 @@ The list of committers in the YARP repository (ordered by number of commit) is: Andrea Del Prete Arjan Gijsberts Carlos Beltran-Gonzalez + robotology-bot (Tag Repository Action) Claudio Castellini Daniel Krieg - robotology-bot (Tag Repository Action) Simone Girardi Fabio Valla Arren Glover diff --git a/doc/001_installation/1_download.dox b/doc/001_installation/1_download.dox index 0aeac8b52e..4c21b7a278 100644 --- a/doc/001_installation/1_download.dox +++ b/doc/001_installation/1_download.dox @@ -5,7 +5,7 @@ Latest YARP release is: - + \ref v3_10_0 + + \ref v3_10_1 \section download_source_code Source Code @@ -23,6 +23,7 @@ Previous versions are hosted on [GitHub](https://github.com/robotology/yarp/rele __Previous releases version and dates__: + + \ref v3_10_0 + \ref v3_9_1 + \ref v3_9_0 + \ref v3_8_1 diff --git a/doc/release/v3_10_1.md b/doc/release/v3_10_1.md new file mode 100644 index 0000000000..3097d0a321 --- /dev/null +++ b/doc/release/v3_10_1.md @@ -0,0 +1,31 @@ +YARP 3.10.1 (2024-11-26) {#v3_10_1} +======================= + +[TOC] + +YARP 3.10.1 Release Notes +======================== + + +A (partial) list of bug fixed and issues resolved in this release can be found +[here](https://github.com/robotology/yarp/issues?q=label%3A%22Fixed+in%3A+YARP+v3.10.1%22). + +Fixes +----- + +### `bindings` + +* Fixed regression bug in yarp.i: the file swig_python_windows_preable.i is no more included when a downstream +project (like icub-main) includes the file in its own .i swig binding file. See https://github.com/robotology/yarp/pull/3148 + +Contributors +------------ + +This is a list of people that contributed to this release (generated from the +git history using `git shortlog -ens --no-merges v3.10.0..v3.10.1`): + +``` + 2 Silvio Traversaro + 2 robotology-bot (Tag Repository Action) + 1 Marco Randazzo +``` diff --git a/doc/release/yarp_3_10.md b/doc/release/yarp_3_10.md deleted file mode 100644 index 8011751fc4..0000000000 --- a/doc/release/yarp_3_10.md +++ /dev/null @@ -1,19 +0,0 @@ -YARP (UNRELEASED) {#yarp_3_10} -============================ - -[TOC] - -YARP Release Notes -============================= - - -A (partial) list of bug fixed and issues resolved in this release can be found -[here](https://github.com/robotology/yarp/issues?q=label%3A%22Fixed+in%3A+YARP+yarp-3.10%22). - -Fixes ------ - -### `bindings` - -* Fixed regression bug in yarp.i: the file swig_python_windows_preable.i is no more included when a downstream -project (like icub-main) includes the file in its own .i swig binding file. See https://github.com/robotology/yarp/pull/3148