From 4c09a6ea60929f18f89dde2ec730bd0a1807e487 Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Thu, 6 Feb 2025 14:14:27 +0100 Subject: [PATCH] fixed headers --- demos/eigenmvn.h | 5 ----- demos/mcapi_utils.cpp | 5 ----- demos/mcapi_utils.h | 5 ----- demos/solo_imu_kine.cpp | 5 ----- demos/solo_imu_kine_mocap.cpp | 5 ----- demos/solo_imu_mocap.cpp | 5 ----- demos/solo_kine_mocap.cpp | 5 ----- demos/solo_real_povcdl_estimation.cpp | 5 ----- include/bodydynamics/capture/capture_force_torque.h | 5 ----- include/bodydynamics/capture/capture_force_torque_inertial.h | 5 ----- include/bodydynamics/capture/capture_inertial_kinematics.h | 5 ----- include/bodydynamics/capture/capture_leg_odom.h | 5 ----- include/bodydynamics/capture/capture_point_feet_nomove.h | 5 ----- include/bodydynamics/common/bodydynamics.h | 5 ----- include/bodydynamics/factor/factor_angular_momentum.h | 5 ----- include/bodydynamics/factor/factor_force_torque.h | 5 ----- include/bodydynamics/factor/factor_force_torque_inertial.h | 5 ----- .../factor/factor_force_torque_inertial_dynamics.h | 5 ----- include/bodydynamics/factor/factor_inertial_kinematics.h | 5 ----- include/bodydynamics/factor/factor_point_feet_altitude.h | 5 ----- include/bodydynamics/factor/factor_point_feet_nomove.h | 5 ----- .../bodydynamics/factor/factor_point_feet_zero_velocity.h | 5 ----- include/bodydynamics/feature/feature_force_torque.h | 5 ----- include/bodydynamics/feature/feature_inertial_kinematics.h | 5 ----- include/bodydynamics/math/force_torque_delta_tools.h | 5 ----- .../bodydynamics/math/force_torque_inertial_delta_tools.h | 5 ----- include/bodydynamics/processor/processor_force_torque.h | 5 ----- .../bodydynamics/processor/processor_force_torque_inertial.h | 5 ----- .../processor/processor_force_torque_inertial_dynamics.h | 5 ----- .../bodydynamics/processor/processor_inertial_kinematics.h | 5 ----- include/bodydynamics/processor/processor_point_feet_nomove.h | 5 ----- include/bodydynamics/sensor/sensor_force_torque.h | 5 ----- include/bodydynamics/sensor/sensor_force_torque_inertial.h | 5 ----- include/bodydynamics/sensor/sensor_inertial_kinematics.h | 5 ----- include/bodydynamics/sensor/sensor_point_feet_nomove.h | 5 ----- include/bodydynamics/utils/load_bodydynamics.h | 5 ----- license_header_2025.txt | 5 ----- src/capture/capture_force_torque.cpp | 5 ----- src/capture/capture_force_torque_inertial.cpp | 5 ----- src/capture/capture_inertial_kinematics.cpp | 5 ----- src/capture/capture_leg_odom.cpp | 5 ----- src/capture/capture_point_feet_nomove.cpp | 5 ----- src/feature/feature_force_torque.cpp | 5 ----- src/feature/feature_inertial_kinematics.cpp | 5 ----- src/processor/processor_force_torque.cpp | 5 ----- src/processor/processor_force_torque_inertial.cpp | 5 ----- src/processor/processor_force_torque_inertial_dynamics.cpp | 5 ----- src/processor/processor_inertial_kinematics.cpp | 5 ----- src/processor/processor_point_feet_nomove.cpp | 5 ----- src/sensor/sensor_force_torque.cpp | 5 ----- src/sensor/sensor_force_torque_inertial.cpp | 5 ----- src/sensor/sensor_inertial_kinematics.cpp | 5 ----- src/sensor/sensor_point_feet_nomove.cpp | 5 ----- src/utils/load_bodydynamics.cpp | 5 ----- test/gtest_capture_inertial_kinematics.cpp | 5 ----- test/gtest_capture_leg_odom.cpp | 5 ----- test/gtest_factor_force_torque_inertial.cpp | 5 ----- test/gtest_factor_force_torque_inertial_dynamics.cpp | 5 ----- test/gtest_factor_inertial_kinematics.cpp | 5 ----- test/gtest_feature_inertial_kinematics.cpp | 5 ----- test/gtest_force_torque_delta_tools.cpp | 5 ----- test/gtest_force_torque_inertial_delta_tools.cpp | 5 ----- test/gtest_load_bodydynamics.cpp | 5 ----- test/gtest_no_load_bodydynamics.cpp | 5 ----- test/gtest_processor_force_torque.cpp | 5 ----- test/gtest_processor_force_torque_inertial.cpp | 5 ----- test/gtest_processor_force_torque_inertial_dynamics.cpp | 5 ----- test/gtest_processor_inertial_kinematics.cpp | 5 ----- test/gtest_processor_point_feet_nomove.cpp | 5 ----- test/gtest_schema.cpp | 5 ----- test/gtest_sensor_force_torque.cpp | 5 ----- test/gtest_sensor_inertial_kinematics.cpp | 5 ----- ...est_simulation_problem_force_torque_inertial_dynamics.cpp | 5 ----- test/gtest_solve_problem_force_torque_inertial_dynamics.cpp | 5 ----- 74 files changed, 370 deletions(-) diff --git a/demos/eigenmvn.h b/demos/eigenmvn.h index d2bc2e5..09ffebb 100644 --- a/demos/eigenmvn.h +++ b/demos/eigenmvn.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/mcapi_utils.cpp b/demos/mcapi_utils.cpp index 2145531..3cb411d 100644 --- a/demos/mcapi_utils.cpp +++ b/demos/mcapi_utils.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/mcapi_utils.h b/demos/mcapi_utils.h index e269db8..d7d3322 100644 --- a/demos/mcapi_utils.h +++ b/demos/mcapi_utils.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/solo_imu_kine.cpp b/demos/solo_imu_kine.cpp index 0f96ca7..40e53ab 100644 --- a/demos/solo_imu_kine.cpp +++ b/demos/solo_imu_kine.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/solo_imu_kine_mocap.cpp b/demos/solo_imu_kine_mocap.cpp index a1b69d8..921ded4 100644 --- a/demos/solo_imu_kine_mocap.cpp +++ b/demos/solo_imu_kine_mocap.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/solo_imu_mocap.cpp b/demos/solo_imu_mocap.cpp index 8a5c60c..2ead37f 100644 --- a/demos/solo_imu_mocap.cpp +++ b/demos/solo_imu_mocap.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/solo_kine_mocap.cpp b/demos/solo_kine_mocap.cpp index 6b4985e..97638de 100644 --- a/demos/solo_kine_mocap.cpp +++ b/demos/solo_kine_mocap.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/demos/solo_real_povcdl_estimation.cpp b/demos/solo_real_povcdl_estimation.cpp index 993c0ca..fa33724 100644 --- a/demos/solo_real_povcdl_estimation.cpp +++ b/demos/solo_real_povcdl_estimation.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/capture/capture_force_torque.h b/include/bodydynamics/capture/capture_force_torque.h index 69abd64..c6289b4 100644 --- a/include/bodydynamics/capture/capture_force_torque.h +++ b/include/bodydynamics/capture/capture_force_torque.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/capture/capture_force_torque_inertial.h b/include/bodydynamics/capture/capture_force_torque_inertial.h index 2001928..e79866f 100644 --- a/include/bodydynamics/capture/capture_force_torque_inertial.h +++ b/include/bodydynamics/capture/capture_force_torque_inertial.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/capture/capture_inertial_kinematics.h b/include/bodydynamics/capture/capture_inertial_kinematics.h index fb05d46..7378b69 100644 --- a/include/bodydynamics/capture/capture_inertial_kinematics.h +++ b/include/bodydynamics/capture/capture_inertial_kinematics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/capture/capture_leg_odom.h b/include/bodydynamics/capture/capture_leg_odom.h index 99003ff..9ac463d 100644 --- a/include/bodydynamics/capture/capture_leg_odom.h +++ b/include/bodydynamics/capture/capture_leg_odom.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/capture/capture_point_feet_nomove.h b/include/bodydynamics/capture/capture_point_feet_nomove.h index 0197a7b..743d732 100644 --- a/include/bodydynamics/capture/capture_point_feet_nomove.h +++ b/include/bodydynamics/capture/capture_point_feet_nomove.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/common/bodydynamics.h b/include/bodydynamics/common/bodydynamics.h index 81e8f0b..485d9ab 100644 --- a/include/bodydynamics/common/bodydynamics.h +++ b/include/bodydynamics/common/bodydynamics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_angular_momentum.h b/include/bodydynamics/factor/factor_angular_momentum.h index 55af04d..a80c3a7 100644 --- a/include/bodydynamics/factor/factor_angular_momentum.h +++ b/include/bodydynamics/factor/factor_angular_momentum.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_force_torque.h b/include/bodydynamics/factor/factor_force_torque.h index 47b45f8..74c009f 100644 --- a/include/bodydynamics/factor/factor_force_torque.h +++ b/include/bodydynamics/factor/factor_force_torque.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_force_torque_inertial.h b/include/bodydynamics/factor/factor_force_torque_inertial.h index d011d61..fecef2a 100644 --- a/include/bodydynamics/factor/factor_force_torque_inertial.h +++ b/include/bodydynamics/factor/factor_force_torque_inertial.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_force_torque_inertial_dynamics.h b/include/bodydynamics/factor/factor_force_torque_inertial_dynamics.h index 76a9f90..fc04312 100644 --- a/include/bodydynamics/factor/factor_force_torque_inertial_dynamics.h +++ b/include/bodydynamics/factor/factor_force_torque_inertial_dynamics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_inertial_kinematics.h b/include/bodydynamics/factor/factor_inertial_kinematics.h index 8a68f34..99d19d3 100644 --- a/include/bodydynamics/factor/factor_inertial_kinematics.h +++ b/include/bodydynamics/factor/factor_inertial_kinematics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_point_feet_altitude.h b/include/bodydynamics/factor/factor_point_feet_altitude.h index 59ccb4a..8ddec2d 100644 --- a/include/bodydynamics/factor/factor_point_feet_altitude.h +++ b/include/bodydynamics/factor/factor_point_feet_altitude.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_point_feet_nomove.h b/include/bodydynamics/factor/factor_point_feet_nomove.h index 8cdf57a..e640e03 100644 --- a/include/bodydynamics/factor/factor_point_feet_nomove.h +++ b/include/bodydynamics/factor/factor_point_feet_nomove.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/factor/factor_point_feet_zero_velocity.h b/include/bodydynamics/factor/factor_point_feet_zero_velocity.h index fbde30f..35527a3 100644 --- a/include/bodydynamics/factor/factor_point_feet_zero_velocity.h +++ b/include/bodydynamics/factor/factor_point_feet_zero_velocity.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/feature/feature_force_torque.h b/include/bodydynamics/feature/feature_force_torque.h index f1395dd..a99ae16 100644 --- a/include/bodydynamics/feature/feature_force_torque.h +++ b/include/bodydynamics/feature/feature_force_torque.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/feature/feature_inertial_kinematics.h b/include/bodydynamics/feature/feature_inertial_kinematics.h index 644b870..60deffd 100644 --- a/include/bodydynamics/feature/feature_inertial_kinematics.h +++ b/include/bodydynamics/feature/feature_inertial_kinematics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/math/force_torque_delta_tools.h b/include/bodydynamics/math/force_torque_delta_tools.h index fd0c90a..1f226d9 100644 --- a/include/bodydynamics/math/force_torque_delta_tools.h +++ b/include/bodydynamics/math/force_torque_delta_tools.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/math/force_torque_inertial_delta_tools.h b/include/bodydynamics/math/force_torque_inertial_delta_tools.h index 069096d..a4648d6 100644 --- a/include/bodydynamics/math/force_torque_inertial_delta_tools.h +++ b/include/bodydynamics/math/force_torque_inertial_delta_tools.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/processor/processor_force_torque.h b/include/bodydynamics/processor/processor_force_torque.h index 857caaa..c12c0df 100644 --- a/include/bodydynamics/processor/processor_force_torque.h +++ b/include/bodydynamics/processor/processor_force_torque.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/processor/processor_force_torque_inertial.h b/include/bodydynamics/processor/processor_force_torque_inertial.h index fc0828e..607da44 100644 --- a/include/bodydynamics/processor/processor_force_torque_inertial.h +++ b/include/bodydynamics/processor/processor_force_torque_inertial.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/processor/processor_force_torque_inertial_dynamics.h b/include/bodydynamics/processor/processor_force_torque_inertial_dynamics.h index c54f5fa..b4237dd 100644 --- a/include/bodydynamics/processor/processor_force_torque_inertial_dynamics.h +++ b/include/bodydynamics/processor/processor_force_torque_inertial_dynamics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/processor/processor_inertial_kinematics.h b/include/bodydynamics/processor/processor_inertial_kinematics.h index a2e9ce5..215565f 100644 --- a/include/bodydynamics/processor/processor_inertial_kinematics.h +++ b/include/bodydynamics/processor/processor_inertial_kinematics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/processor/processor_point_feet_nomove.h b/include/bodydynamics/processor/processor_point_feet_nomove.h index e52ae55..b25c2ec 100644 --- a/include/bodydynamics/processor/processor_point_feet_nomove.h +++ b/include/bodydynamics/processor/processor_point_feet_nomove.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/sensor/sensor_force_torque.h b/include/bodydynamics/sensor/sensor_force_torque.h index 8db099f..4f972a7 100644 --- a/include/bodydynamics/sensor/sensor_force_torque.h +++ b/include/bodydynamics/sensor/sensor_force_torque.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/sensor/sensor_force_torque_inertial.h b/include/bodydynamics/sensor/sensor_force_torque_inertial.h index 00f17b9..1da66d9 100644 --- a/include/bodydynamics/sensor/sensor_force_torque_inertial.h +++ b/include/bodydynamics/sensor/sensor_force_torque_inertial.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/sensor/sensor_inertial_kinematics.h b/include/bodydynamics/sensor/sensor_inertial_kinematics.h index 9ce3b41..b9fa6dc 100644 --- a/include/bodydynamics/sensor/sensor_inertial_kinematics.h +++ b/include/bodydynamics/sensor/sensor_inertial_kinematics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/sensor/sensor_point_feet_nomove.h b/include/bodydynamics/sensor/sensor_point_feet_nomove.h index f1312c1..a218ab5 100644 --- a/include/bodydynamics/sensor/sensor_point_feet_nomove.h +++ b/include/bodydynamics/sensor/sensor_point_feet_nomove.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/include/bodydynamics/utils/load_bodydynamics.h b/include/bodydynamics/utils/load_bodydynamics.h index 8350bd2..09a4f1e 100644 --- a/include/bodydynamics/utils/load_bodydynamics.h +++ b/include/bodydynamics/utils/load_bodydynamics.h @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/license_header_2025.txt b/license_header_2025.txt index 6aeb479..c35bd7d 100644 --- a/license_header_2025.txt +++ b/license_header_2025.txt @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/capture/capture_force_torque.cpp b/src/capture/capture_force_torque.cpp index ad15941..24ff4d1 100644 --- a/src/capture/capture_force_torque.cpp +++ b/src/capture/capture_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/capture/capture_force_torque_inertial.cpp b/src/capture/capture_force_torque_inertial.cpp index 02824ed..3bec083 100644 --- a/src/capture/capture_force_torque_inertial.cpp +++ b/src/capture/capture_force_torque_inertial.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/capture/capture_inertial_kinematics.cpp b/src/capture/capture_inertial_kinematics.cpp index 1a833a5..e209333 100644 --- a/src/capture/capture_inertial_kinematics.cpp +++ b/src/capture/capture_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/capture/capture_leg_odom.cpp b/src/capture/capture_leg_odom.cpp index c33c2a1..a772322 100644 --- a/src/capture/capture_leg_odom.cpp +++ b/src/capture/capture_leg_odom.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/capture/capture_point_feet_nomove.cpp b/src/capture/capture_point_feet_nomove.cpp index 5bc7caa..9d99d53 100644 --- a/src/capture/capture_point_feet_nomove.cpp +++ b/src/capture/capture_point_feet_nomove.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/feature/feature_force_torque.cpp b/src/feature/feature_force_torque.cpp index ce323c9..58dc7b7 100644 --- a/src/feature/feature_force_torque.cpp +++ b/src/feature/feature_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/feature/feature_inertial_kinematics.cpp b/src/feature/feature_inertial_kinematics.cpp index 8923ae4..6ecc8d8 100644 --- a/src/feature/feature_inertial_kinematics.cpp +++ b/src/feature/feature_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/processor/processor_force_torque.cpp b/src/processor/processor_force_torque.cpp index a723f0e..e43a3e0 100644 --- a/src/processor/processor_force_torque.cpp +++ b/src/processor/processor_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/processor/processor_force_torque_inertial.cpp b/src/processor/processor_force_torque_inertial.cpp index 7389f9e..e51d59d 100644 --- a/src/processor/processor_force_torque_inertial.cpp +++ b/src/processor/processor_force_torque_inertial.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/processor/processor_force_torque_inertial_dynamics.cpp b/src/processor/processor_force_torque_inertial_dynamics.cpp index 908db73..fce77e9 100644 --- a/src/processor/processor_force_torque_inertial_dynamics.cpp +++ b/src/processor/processor_force_torque_inertial_dynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/processor/processor_inertial_kinematics.cpp b/src/processor/processor_inertial_kinematics.cpp index f76cc18..8c7a1ee 100644 --- a/src/processor/processor_inertial_kinematics.cpp +++ b/src/processor/processor_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/processor/processor_point_feet_nomove.cpp b/src/processor/processor_point_feet_nomove.cpp index 959c914..eeb1128 100644 --- a/src/processor/processor_point_feet_nomove.cpp +++ b/src/processor/processor_point_feet_nomove.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/sensor/sensor_force_torque.cpp b/src/sensor/sensor_force_torque.cpp index 4c94155..dce5dcf 100644 --- a/src/sensor/sensor_force_torque.cpp +++ b/src/sensor/sensor_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/sensor/sensor_force_torque_inertial.cpp b/src/sensor/sensor_force_torque_inertial.cpp index a88b12a..2c33eac 100644 --- a/src/sensor/sensor_force_torque_inertial.cpp +++ b/src/sensor/sensor_force_torque_inertial.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/sensor/sensor_inertial_kinematics.cpp b/src/sensor/sensor_inertial_kinematics.cpp index a6d1e91..88d1296 100644 --- a/src/sensor/sensor_inertial_kinematics.cpp +++ b/src/sensor/sensor_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/sensor/sensor_point_feet_nomove.cpp b/src/sensor/sensor_point_feet_nomove.cpp index 76b4884..8b1223c 100644 --- a/src/sensor/sensor_point_feet_nomove.cpp +++ b/src/sensor/sensor_point_feet_nomove.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/src/utils/load_bodydynamics.cpp b/src/utils/load_bodydynamics.cpp index 3336747..e311e21 100644 --- a/src/utils/load_bodydynamics.cpp +++ b/src/utils/load_bodydynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_capture_inertial_kinematics.cpp b/test/gtest_capture_inertial_kinematics.cpp index 15c42b6..dfdba62 100644 --- a/test/gtest_capture_inertial_kinematics.cpp +++ b/test/gtest_capture_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_capture_leg_odom.cpp b/test/gtest_capture_leg_odom.cpp index e6c1995..cb8c85c 100644 --- a/test/gtest_capture_leg_odom.cpp +++ b/test/gtest_capture_leg_odom.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_factor_force_torque_inertial.cpp b/test/gtest_factor_force_torque_inertial.cpp index 31244c4..9b8233a 100644 --- a/test/gtest_factor_force_torque_inertial.cpp +++ b/test/gtest_factor_force_torque_inertial.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_factor_force_torque_inertial_dynamics.cpp b/test/gtest_factor_force_torque_inertial_dynamics.cpp index f57e52e..96048d8 100644 --- a/test/gtest_factor_force_torque_inertial_dynamics.cpp +++ b/test/gtest_factor_force_torque_inertial_dynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_factor_inertial_kinematics.cpp b/test/gtest_factor_inertial_kinematics.cpp index dc16c3b..a011fb2 100644 --- a/test/gtest_factor_inertial_kinematics.cpp +++ b/test/gtest_factor_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_feature_inertial_kinematics.cpp b/test/gtest_feature_inertial_kinematics.cpp index 952f82e..a18d99c 100644 --- a/test/gtest_feature_inertial_kinematics.cpp +++ b/test/gtest_feature_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_force_torque_delta_tools.cpp b/test/gtest_force_torque_delta_tools.cpp index 65ef584..3971a68 100644 --- a/test/gtest_force_torque_delta_tools.cpp +++ b/test/gtest_force_torque_delta_tools.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_force_torque_inertial_delta_tools.cpp b/test/gtest_force_torque_inertial_delta_tools.cpp index a4f909e..a2874ff 100644 --- a/test/gtest_force_torque_inertial_delta_tools.cpp +++ b/test/gtest_force_torque_inertial_delta_tools.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_load_bodydynamics.cpp b/test/gtest_load_bodydynamics.cpp index 096ef78..45d1b79 100644 --- a/test/gtest_load_bodydynamics.cpp +++ b/test/gtest_load_bodydynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_no_load_bodydynamics.cpp b/test/gtest_no_load_bodydynamics.cpp index 37edf20..a0450ed 100644 --- a/test/gtest_no_load_bodydynamics.cpp +++ b/test/gtest_no_load_bodydynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_processor_force_torque.cpp b/test/gtest_processor_force_torque.cpp index d3e575a..1b949c4 100644 --- a/test/gtest_processor_force_torque.cpp +++ b/test/gtest_processor_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_processor_force_torque_inertial.cpp b/test/gtest_processor_force_torque_inertial.cpp index 133cf0c..4dbdb2b 100644 --- a/test/gtest_processor_force_torque_inertial.cpp +++ b/test/gtest_processor_force_torque_inertial.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_processor_force_torque_inertial_dynamics.cpp b/test/gtest_processor_force_torque_inertial_dynamics.cpp index 5182bab..4ed9124 100644 --- a/test/gtest_processor_force_torque_inertial_dynamics.cpp +++ b/test/gtest_processor_force_torque_inertial_dynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_processor_inertial_kinematics.cpp b/test/gtest_processor_inertial_kinematics.cpp index 2c2de1f..5c9cd79 100644 --- a/test/gtest_processor_inertial_kinematics.cpp +++ b/test/gtest_processor_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_processor_point_feet_nomove.cpp b/test/gtest_processor_point_feet_nomove.cpp index bab58c2..b59b77f 100644 --- a/test/gtest_processor_point_feet_nomove.cpp +++ b/test/gtest_processor_point_feet_nomove.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_schema.cpp b/test/gtest_schema.cpp index c214312..965771a 100644 --- a/test/gtest_schema.cpp +++ b/test/gtest_schema.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_sensor_force_torque.cpp b/test/gtest_sensor_force_torque.cpp index 833f494..24f3848 100644 --- a/test/gtest_sensor_force_torque.cpp +++ b/test/gtest_sensor_force_torque.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_sensor_inertial_kinematics.cpp b/test/gtest_sensor_inertial_kinematics.cpp index bc5374c..40b6fa7 100644 --- a/test/gtest_sensor_inertial_kinematics.cpp +++ b/test/gtest_sensor_inertial_kinematics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_simulation_problem_force_torque_inertial_dynamics.cpp b/test/gtest_simulation_problem_force_torque_inertial_dynamics.cpp index f3ee0fe..597f871 100644 --- a/test/gtest_simulation_problem_force_torque_inertial_dynamics.cpp +++ b/test/gtest_simulation_problem_force_torque_inertial_dynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf diff --git a/test/gtest_solve_problem_force_torque_inertial_dynamics.cpp b/test/gtest_solve_problem_force_torque_inertial_dynamics.cpp index 1b7e462..0e71fe9 100644 --- a/test/gtest_solve_problem_force_torque_inertial_dynamics.cpp +++ b/test/gtest_solve_problem_force_torque_inertial_dynamics.cpp @@ -1,12 +1,7 @@ -<<<<<<<< HEAD:license_header_2024,2025.txt // WOLF - Copyright (C) 2020,2021,2022,2023,2024,2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Solà Ortega (jsola@iri.upc.edu) and // Joan Vallvé Navarro (jvallve@iri.upc.edu) -======== -// Copyright (C) 2020,2021,2022,2023 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. -// Authors: Joan Solà Ortega (jsola@iri.upc.edu) ->>>>>>>> origin/identification:license_header_2023.txt // All rights reserved. // // This file is part of WOLF: http://www.iri.upc.edu/wolf -- GitLab