Jason Wen ccfb7ff153 Merge branch 'master' into sync-priv-20231016 ...

# Conflicts:
#	panda
#	selfdrive/car/chrysler/values.py
#	selfdrive/car/ford/values.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/values.py
#	selfdrive/controls/controlsd.py
#	selfdrive/controls/plannerd.py
#	selfdrive/sentry.py
#	selfdrive/ui/qt/offroad/settings.cc

2023-10-16 11:52:39 -04:00

..

installer

cpplint: build/include_what_you_use (#29556)

2023-08-23 13:25:17 -07:00

qt

Merge branch 'master' into sync-priv-20231016

2023-10-16 11:52:39 -04:00

soundd

Merge branch 'master' into sync-priv-20231016

2023-10-16 11:52:39 -04:00

tests

Merge branch 'upstream/openpilot/master-20231016-sync' into master-20231016

2023-10-16 11:03:27 -04:00

translations

Revert "Sync master-priv with public sunnypilot:master"

2023-10-16 04:53:55 +00:00

.gitignore

ui: multilang offroad alerts (#28512)

2023-06-22 15:04:28 +01:00

main.cc

ui: add translation files to assets.qrc (#29597)

2023-08-25 19:05:35 -07:00

mui.cc

UI: border is always engagement state (#27416)

2023-06-22 21:37:08 -07:00

SConscript

Merge branch 'master' into sync-priv-20231016

2023-10-16 11:52:39 -04:00

spinner

cleanup up old lib64 references (#30246)

2023-10-14 20:39:15 -07:00

text

cleanup up old lib64 references (#30246)

2023-10-14 20:39:15 -07:00

ui

cleanup up old lib64 references (#30246)

2023-10-14 20:39:15 -07:00

ui.cc

ui: New ButtomParamControl design

2023-10-04 16:59:33 +00:00

ui.h

Merge branch 'master' into sync-priv-20231016

2023-10-16 11:52:39 -04:00

update_translations.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

watch3.cc

UI Onroad widget renames (#26124)

2022-10-17 18:18:01 -07:00