discountchubbs edf697392c # Conflicts: ...

#	opendbc_repo
#	selfdrive/ui/sunnypilot/layouts/settings/settings.py
#	selfdrive/ui/sunnypilot/mici/layouts/settings.py
#	selfdrive/ui/sunnypilot/ui_state.py

2025-12-29 08:40:01 -07:00

..

assets

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

2025-12-17 21:09:26 -05:00

car

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

2025-12-17 21:09:26 -05:00

controls

Revert "latcontrol_torque: lower kp and lower friction threshold (commaai/openpilot#36619)" (#1581)

2025-12-17 21:32:18 -05:00

debug

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

2025-12-17 21:09:26 -05:00

locationd

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

2025-12-13 01:50:42 -05:00

modeld

modeld: camera offset class

2025-12-25 17:58:10 -06:00

monitoring

# Conflicts:

2025-12-29 08:40:01 -07:00

pandad

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

2025-12-17 21:09:26 -05:00

selfdrived

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

2025-12-17 21:09:26 -05:00

test

Revert "latcontrol_torque: lower kp and lower friction threshold (commaai/openpilot#36619)" (#1581)

2025-12-17 21:32:18 -05:00

ui

# Conflicts:

2025-12-29 08:40:01 -07:00

__init__.py

…

SConscript

raylib: multilang (#36195)

2025-10-22 16:28:28 -07:00