 DevTekVE
|
e0110198bf
|
Merge branch 'refs/heads/master-priv' into SP-147-sync-priv-2024
# Conflicts:
# system/manager/process_config.py
|
2024-06-11 09:25:59 +02:00 |
|
|
Jason Wen
|
e36dbe97b5
|
Merge branch 'master' into SP-147-sync-priv-2024
# Conflicts:
# common/api/__init__.py
# panda
# release/build_release.sh
# release/files_common
# selfdrive/car/card.py
# selfdrive/car/toyota/carcontroller.py
# selfdrive/controls/controlsd.py
# selfdrive/controls/radard.py
# selfdrive/ui/qt/api.cc
# selfdrive/ui/qt/maps/map.cc
# selfdrive/ui/ui.cc
# system/athena/manage_athenad.py
# system/athena/manage_sunnylinkd.py
# system/athena/sunnylinkd.py
# system/manager/gitlab_runner.sh
# system/manager/manager.py
# system/manager/mapd_installer.py
# system/manager/process_config.py
# system/manager/sunnylink.py
# system/sentry.py
|
2024-06-10 21:24:23 -04:00 |
|
|
Jason Wen
|
1ffc59f65a
|
Merge branch 'upstream/openpilot/master' into sync-20240608
# Conflicts:
# cereal
# opendbc
# panda
# release/files_common
# selfdrive/monitoring/dmonitoringd.py
# selfdrive/ui/translations/main_zh-CHS.ts
# selfdrive/ui/translations/main_zh-CHT.ts
|
2024-06-08 23:08:33 -04:00 |
|
|
Adeeb Shihadeh
|
accdade4cf
|
manager: move to system/ (#32538)
* manager: move to system/
* one more
|
2024-05-25 12:41:17 -07:00 |
|