1. 06 Oct, 2021 2 commits
    • Andreas Rauschert's avatar
      Merge master into buildfix_define_function_in_header_inline · f84797ea
      Andreas Rauschert authored
      Conflicting files:
      MantleAPI/include/MantleAPI/Execution/i_environment.h
      MantleAPI/include/MantleAPI/Map/i_lane_location_query_service.h
      MantleAPI/include/MantleAPI/Map/map_details.h
      MantleAPI/include/MantleAPI/Traffic/control_strategy.h
      MantleAPI/include/MantleAPI/Traffic/entity_helper.h
      MantleAPI/include/MantleAPI/Traffic/entity_properties.h
      MantleAPI/include/MantleAPI/Traffic/i_entity.h
      MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
      MantleAPI/test/MantleAPI/Test/test_utils.h
      MantleAPI/test/interface_test.cpp
      f84797ea
    • Christoph Kochendoerfer's avatar
      Merge branch 'bugfix/unit_usage' into 'master' · 6e78b450
      Christoph Kochendoerfer authored
      Fixed some merging issues regarding units
      
      See merge request !17
      6e78b450
  2. 29 Sep, 2021 1 commit
  3. 27 Sep, 2021 2 commits
  4. 15 Sep, 2021 1 commit
  5. 14 Sep, 2021 1 commit
  6. 10 Sep, 2021 1 commit
  7. 01 Sep, 2021 1 commit
  8. 25 Aug, 2021 1 commit
  9. 18 Aug, 2021 3 commits
  10. 17 Aug, 2021 2 commits
  11. 13 Aug, 2021 3 commits
  12. 12 Aug, 2021 3 commits
  13. 10 Aug, 2021 4 commits
  14. 09 Aug, 2021 5 commits
  15. 06 Aug, 2021 4 commits
  16. 04 Aug, 2021 3 commits
  17. 03 Aug, 2021 1 commit
  18. 30 Jul, 2021 1 commit
  19. 29 Jul, 2021 1 commit