Skip to content

Commit

Permalink
Merge pull request #1208 from MRPT/develop
Browse files Browse the repository at this point in the history
Merge into master to release v2.4.1
  • Loading branch information
jlblancoc authored Jan 5, 2022
2 parents 9347e74 + dd449f9 commit 6c282e9
Show file tree
Hide file tree
Showing 2,111 changed files with 3,493 additions and 3,236 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ jobs:
shell: bash
run: |
cmake --build . -j 4 --config ${{ matrix.build_type }} --target all_mrpt_libs
cmake --build . -j 4 --config ${{ matrix.build_type }} --target tests_build_all
cmake --build . -j 4 --config ${{ matrix.build_type }} --target test_legacy
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/GL/freeglut.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/GL/freeglut_ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/GL/freeglut_std.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/GL/glut.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_callbacks.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_cursor.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_font.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_font_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_gamemode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_geometry.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_glutfont_definitions.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_joystick.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_stroke_mono_roman.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_stroke_roman.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_structure.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_teapot.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_teapot_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_videoresize.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/freeglut/freeglut_window.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See details in https://www.mrpt.org/License |
+---------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/glext/include/glext/glext.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
| Mobile Robot Programming Toolkit (MRPT) |
| https://www.mrpt.org/ |
| |
| Copyright (c) 2005-2021, Individual contributors, see AUTHORS file |
| Copyright (c) 2005-2022, Individual contributors, see AUTHORS file |
| See: https://www.mrpt.org/Authors - All rights reserved. |
| Released under BSD License. See: https://www.mrpt.org/License |
+------------------------------------------------------------------------+ */
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/nanogui
Submodule nanogui updated 1 files
+15 −2 CMakeLists.txt
Loading

0 comments on commit 6c282e9

Please sign in to comment.