diff --git a/demos/eigenmvn.h b/demos/eigenmvn.h index d2bc2e50d2f3a4d465d2981f96e1b1df94609dee..09ffebb620663a28512d18707162f92a27abc458 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 21455314145127447262a41390bff344475401bb..3cb411d8dac0bd8bdc862b9ecba47ed95a22bc92 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 e269db81ae9f7cdab99174587a3062bf37bfe97e..d7d3322dbeff671e3771fe4baee65090e412a26b 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 0f96ca701937609aafb5b082b099adcbf786a772..40e53abfae10c1e994bcab4036ff584c952d92d7 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 a1b69d82e8f10d5f1216cf8b5e02c4e996c59b4c..921ded44388f5bf6b020146b0307769052ac1bae 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 8a5c60c8c377f2c8d5b58fccee3aebb269c615e4..2ead37f5bfc66755b740223217997c656a7e4be2 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 6b4985e1ace46206971438ace808c76b9d48279d..97638de458ad8b4e363170b6d447f46a52ad981d 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 993c0ca6532681d948015ee41991d7ac32bcb0ae..fa33724cd2b808331da950fa4ab983a8464890ff 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 69abd64f087637ffe3232a123b7f7700fb412fe0..c6289b44281ae967b45754550db7d7bda89c1320 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 20019282c6b678fd1c31789c6e3a4bc3671fc4c0..e79866fb29180addbf02774d79beca6dabcec18d 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 fb05d460eafcc10a2abd9bb2f120ede70f8e7c8c..7378b69b89c1afd9d9e3b827117da0abc5383e31 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 99003ff6f766d196cd7e11be10b9a05f9cd6fe32..9ac463dea3ad552a5c8275553c4cbc2188980efc 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 0197a7b6295db8cfeda9c2081ab79cdde8e11300..743d7321d304c9ce541313263a7964e33df269e8 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 81e8f0b046df96336086bb0b79ac9a7f71fff85e..485d9abddf187e1484ef21f90e1c750c0a4d6959 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 55af04d7d7026ac9c2a5ea955914340c7e9bb391..a80c3a752c634e64b25e79cb275a032ec33496e3 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 47b45f817cc38d51a06ca792d95448977d72aa63..74c009f9442de0cf17702d01d07e15d5ec0108ea 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 d011d616f9d86a3e19e4cec512be443e8169e5fe..fecef2a45eb0628181b743801a9958026b9a48b8 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 76a9f90bd0e9486c12100f918671d76501e6ac81..fc0431286dd1d4d99765cd6a506d0da212335221 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 8a68f3410cf51d3ce1e36f588f3d2c61b25754ab..99d19d3ef7c5c0342dc28c3060a52aec493e0554 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 59ccb4ad30fee7f4355022638553db968b1b2d58..8ddec2dbbae70b7cb615b4652e44dc36154d35b8 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 8cdf57aebe07c7a0fac6608db85c7d3f4a3ec377..e640e03a2a6cfad3392f8f1913da9da0eeaf73b1 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 fbde30fbaef585eb99cec653d5a1c6bde23d39c4..35527a3f39295c8b2cdaa75a379620e46dfee00b 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 f1395ddc9d455044933873d656e65828f161084c..a99ae16afb0f00dd5cf56528b99a53b7e0df97ff 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 644b87027ccb553774f0de5ab74ec3742399bd27..60deffde4e2e8a26ea0f211eebe90ef5492b88ab 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 fd0c90a2b946ebca6e23e8efa49cb0b45d4a25cb..1f226d94e800035fccc9de08453c6d314acae4d8 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 069096d9071d0f8a988771c3bc44313023905090..a4648d62521166373db075b3af85727a1c0d7e1d 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 857caaa595d19a9d83f7414b31c39ddb9cde5831..c12c0dfb992231c3af3d6e90ae1e46a777973ae7 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 fc0828e24e638ee58d769a0f412689f7ddd04328..607da44e7ba05cd5a83b7ee0803b0b498c843367 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 c54f5fa75ff840cedf743f7b3b64d2e33795b9cb..b4237dd9c8067a4f39a497cae29586530231403d 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 a2e9ce5f409feb1af7aaab46348b3e69f13d2b26..215565f4cb43a36fc3dd6b7ba623ce0e6ab83b9d 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 e52ae55ff620680fae18e692e06f82f1262cc9c0..b25c2eccd1c8a313209cdcb79320e301ab558c3a 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 8db099f4f79393c620fed96313e3d2b92549d586..4f972a7ded8f9f6756971b38010395599d249293 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 00f17b9cb9096d7cabae6eed2e9dd1bd3143b09b..1da66d9d6b6fdf1ef2962619d049f3c684e61fd8 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 9ce3b41f6e5c26038c595e7c2528b4d5fe721a4b..b9fa6dc938d21f81ac73f9b455cc4d611cf1e7a1 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 f1312c129726c085c95f23c3e3f1d47e75411e28..a218ab59433e8b1548b72363ec7a41e25aa6b2d8 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 8350bd2674fc9f23b2d036a987bf2fd6a4bd5de8..09a4f1eb6043dace20ea1eb0643e5634be2c4d2c 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 6aeb47984571e163bbd27e6a2091865e84828c24..c35bd7d047ade8957d14cb611959ee66a235f5bf 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 ad15941744eeb5c6aec6ba75449ba86cb087d74b..24ff4d19004376228235a9855de45b40c2f44996 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 02824ede490177a2ae0e410aca156fe105dab31c..3bec0836bb335a0f4ec2cc38e0ab0ae85e341107 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 1a833a510794d3476f959aecf39dd24ddbd52846..e209333e0302022644dbb0d388bded1c4d4c0e41 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 c33c2a115a1714b47ce8bc458c702401ba3f80ae..a772322ab84c7f447d6c98376ba5b96f3d9b14a1 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 5bc7caa8e989ffc6c75156f002e83faa4e209af8..9d99d53f54d4b75b5b525bd3d7b34d3bfd95b6e2 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 ce323c90fd9f5794b352bf44558f6ce529267c14..58dc7b7531a41dbe5d15dca9b6c83c642777c4bc 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 8923ae48fa9088640c80b77fbaee70af3627f506..6ecc8d8e550e0eb37ddef4fa2896779e3aca3d88 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 a723f0ea026af5aa5a0edd947077e14b7bd4c55d..e43a3e0052585a3c854bb9a347f0062d5b9a3bba 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 7389f9e60f20eff8e29eb8447df75711a976f697..e51d59d9967a2d11169079081a62b0167de34811 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 908db73a2feea280fa4fb81e35ddf74c7aea3c06..fce77e92dd4be35cb3e731a71e87aeb42f2a4662 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 f76cc18f1f92f7853a5b9255302fc4083bfd32d3..8c7a1eeceb01922ceda563018341177170bffe85 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 959c914bb3b7f9d1701f17a6f307e9bf41522e79..eeb112867baf0ab2aee552dadbc141c0004b8f37 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 4c94155847617248463c2369455209d69e533efa..dce5dcff3ea1bb6d0e504c9d720d91cc6d447238 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 a88b12ac21cfe0fe42fead580423dc883c623544..2c33eac741a0d965dc9f618b52734c0c185ee50f 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 a6d1e9176a932a82b5e14f446f4827a578f42603..88d1296f8ae4990edc0a866197c2068bd9d16748 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 76b488434ee4ed452285ed832199b06aaf78c0c8..8b1223cde209408c3ed1d4f43bc7ad872aded19b 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 333674702d11252b9edcf827df0fd975aeb6bbe9..e311e21ccf2d68bbca1c746654dc5d186b3eeb28 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 15c42b6b35cb330ed6827e7119935f70b2d4a309..dfdba624774c8149f59e92e03ad20b1ac09afc31 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 e6c199542a81dcba81cce1f72fb1a9cee18102f3..cb8c85ce70c51bb29ea1a618bc3534f5e72731d4 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 31244c49c694e6eefab95a3dc35bd9b3c93fd910..9b8233afcc3d10350761bb193750dd5b8c50dad8 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 f57e52eafaecf6123ba7dfa2569669f5b4349cd5..96048d8aae4f3c1b5f03aa5e3342fb6c869a1de4 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 dc16c3b3f52577145073e44235005eaee1935812..a011fb245f448d6f8fb23d6d3078e23cf7c236a9 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 952f82e0b360c66b418a4f42812d14ff22ef35ce..a18d99c4c229359b25427e09481f6169e0507ef5 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 65ef5844e44a6ecfba8cd4d3238a339458c42c9c..3971a68981b54dde47f4d9fc015f7af3d9e656f5 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 a4f909e8ec56d87efd6032d98d8dd354b2d95d04..a2874ff2a916b5acaba95d51b2fc45320bf589dc 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 096ef781033dfbee2d88fba8ca0152458469e46d..45d1b797f50903c4dbf0bde0209e36d437f63730 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 37edf203d8fbd8f2d459fa390ec7ba441e669a54..a0450ed4ffea3c74e74ee73755ea35b6c0967ff9 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 d3e575a62a0901a24ad1e3e8b166d7044871f296..1b949c4335500fdf303407f1518fac5780f2d2bd 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 133cf0c8a1e732c6981ef4f2b1b62df9c2f4a343..4dbdb2bd22be1398c8b4e2982224fd86940c8507 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 5182bab1bf1f9108bf660c3312982c4ac7c861d4..4ed912485cd56fe329f75673f4064db03a76e091 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 2c2de1fc47c2fd2b76d90d051b9a93db39cb1e3e..5c9cd793ec5ac8df165ca4058e6e691ed9657715 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 bab58c254d93a53f676d7b232a4d86a0ed73db17..b59b77fc4a37f06d4380cd221f1b6b085eafd7c9 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 c2143123b9abf4f071d9664be15d84e17eaa4379..965771a8cdb97a92afd0687577a646194e6d9fec 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 833f494fac1b30a0884e5d718cbc69cf85774ad6..24f3848949429d402134cd03e439007416180e6b 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 bc5374c0bbd2aa21bd3912f140c07e58459335b8..40b6fa7656616130668e7d721010177e3660a4c3 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 f3ee0fe34bea020b69e5e1394974ad6b92196a79..597f8715b963cc3b0029cd8175cdc8abc0247167 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 1b7e462257b1cdf3d5820a293250b1bec22d75fb..0e71fe996a862cc83d7aec8744708ab38ded88e6 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