diff --git a/.github/workflows/nightly-merge.yml b/.github/workflows/nightly-merge.yml index 20bc85e012..bfdc248190 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: 'yarp-3.9' + stable_branch: 'master' development_branch: 'master' allow_ff: false user_name: 'robotology-bot' diff --git a/CMakeLists.txt b/CMakeLists.txt index bf320e1596..2e1c80d1a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() # Main project project( YARP - VERSION 3.9.1 + VERSION 3.10.0 LANGUAGES C CXX ) set(PROJECT_DESCRIPTION "YARP: A thin middleware for humanoid robots and more") diff --git a/COPYING b/COPYING index 626033d126..6a3a8e0e88 100644 --- a/COPYING +++ b/COPYING @@ -61,7 +61,7 @@ GPL-2.0 or later, GPL-3.0 or later, or Apache-2.0 License: [libdc1394](http://damien.douxchamps.net/ieee1394/libdc1394/) or, if the library is not available, links statically a few files taken from [libdc1394](http://libdc1394.git.sourceforge.net/git/gitweb.cgi?p=libdc1394/libdc1394;a=blob_plain;f=libdc1394/dc1394/bayer.c;hb=HEAD). - + The `h264` carrier uses glib (LGPLv2.1 or later) and gstreamer (LGPLv2.1 or + + The `gstreamer` carrier uses glib (LGPLv2.1 or later) and gstreamer (LGPLv2.1 or later). + The `mpi` carrier uses MPI (license dependent on the implementation). + The `dynamixelAX12Ftdi` device uses @@ -117,18 +117,18 @@ The list of committers in the YARP repository (ordered by number of commit) is: Claudio Fantacci Konstantinos Theofilis Alexandre Bernardino + Stefano Dafarra Tobias Fischer Duarte Aragao - Stefano Dafarra Francesco Nori Diego Ferigo + fbrand-new Juan G. Victores Nuno Guedelha Andrea Del Prete Arjan Gijsberts Carlos Beltran-Gonzalez Claudio Castellini - fbrand-new Daniel Krieg robotology-bot (Tag Repository Action) Simone Girardi @@ -171,7 +171,10 @@ The list of committers in the YARP repository (ordered by number of commit) is: Naeem Assif Mirza Simone Ze Ji + Alessandro Croci + Alessandro Croci Austin Kothig + Bartek Łukawski Carlo Ciliberto Carlotta Sartore Claudia Latella @@ -199,9 +202,9 @@ The list of committers in the YARP repository (ordered by number of commit) is: elisabeth-ms The list of copyright holders for YARP is: - Copyright (C) 1995, 2000, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 - Istituto Italiano di Tecnologia (IIT) (2900 files) - RobotCub Consortium (738 files) + Copyright (C) 1995, 2000, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 + Istituto Italiano di Tecnologia (IIT) (2678 files) + RobotCub Consortium (728 files) Daniel Krieg (16 files) Anne van Rossum (11 files) Arjan Gijsberts (10 files) diff --git a/doc/001_installation/1_download.dox b/doc/001_installation/1_download.dox index 926fd8e0ab..0aeac8b52e 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_9_1 + + \ref v3_10_0 \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_9_1 + \ref v3_9_0 + \ref v3_8_1 + \ref v3_8_0 diff --git a/doc/release/master.md b/doc/release/v3_10_0.md similarity index 84% rename from doc/release/master.md rename to doc/release/v3_10_0.md index 2048871034..6b74742917 100644 --- a/doc/release/master.md +++ b/doc/release/v3_10_0.md @@ -1,10 +1,10 @@ YARP 3.10.0 (XXXX-XX-XX) {#v3_10_0} -================== +============= [TOC] YARP 3.10.0 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.0%22). @@ -129,3 +129,25 @@ New Features #### Python * Fix loading of Python bindings on Windows when installed in arbitrary directory. + +Contributors +------------ + +This is a list of people that contributed to this release (generated from the +git history using `git shortlog -ens --no-merges v3.9.0..v3.10.0`): + +``` + 146 Marco Randazzo + 24 Silvio Traversaro + 12 Nicolò Genesio + 10 Stefano Dafarra + 7 fbrand-new + 3 robotology-bot (Tag Repository Action) + 2 Ettore Landini + 1 Alessandro Croci <57228872+xela-95@users.noreply.github.com> + 1 Alessandro Croci + 1 Bartek Łukawski + 1 Bartek Łukawski + 1 Giovanni Fregonese + 1 elisabeth-ms +```