Jason Wen e50f3baa45 Merge branch 'master' into dev-priv/master ...

# Conflicts:
#	panda
#	selfdrive/car/nissan/interface.py
#	selfdrive/car/subaru/carcontroller.py
#	selfdrive/car/subaru/subarucan.py
#	selfdrive/car/toyota/interface.py

2023-09-07 00:05:25 -04:00

..

installer

cpplint: build/include_what_you_use (#29556)

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

qt

Merge branch 'master' into dev-priv/master

2023-09-07 00:05:25 -04:00

soundd

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

tests

Merge remote-tracking branch 'commaai/openpilot/master'

2023-09-05 11:50:47 -04:00

translations

Revert "ui/driverview: inherit from CameraWidget" (#29718)

2023-08-30 14:49:02 -07: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 dev-priv/master-test

2023-09-05 20:17:19 -04:00

spinner

remove comma two support (#24248)

2022-04-18 17:55:23 -07:00

text

remove comma two support (#24248)

2022-04-18 17:55:23 -07:00

ui

navd: rewrite in python (#24621)

2022-05-30 15:15:51 +02:00

ui.cc

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

ui.h

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -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