Jason Wen 761f6eb37f Hyundai non-SCC: Fix upstream merge conflict

2024-02-18 10:22:11 -05:00

..

assets

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

athena

logging: make swaglog context match in python and c (#31288)

2024-02-02 23:10:04 -08:00

boardd

bump cereal (#31392)

2024-02-09 21:44:23 -08:00

car

Hyundai non-SCC: Fix upstream merge conflict

2024-02-18 10:22:11 -05:00

controls

FCR: Reset cached param to sync with upstream conflicts

2024-02-17 23:52:08 +00:00

debug

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

locationd

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

manager

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

modeld

Driving Model Selector: Handle custom navmodel

2024-02-13 15:34:04 -05:00

monitoring

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

2024-02-16 08:27:39 -05:00

navd

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

sunnypilot

Driving Model Selector: Can't import Params on PC

2024-02-12 16:00:32 -05:00

test

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

thermald

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

ui

FCR: Reset cached param to sync with upstream conflicts

2024-02-17 23:52:08 +00:00

__init__.py

…

mapd_manager.py

Merge branch 'sync-20240201' into sync-priv-20240201

2024-02-07 22:49:01 -05:00

sentry.py

Merge branch 'master' into sync-priv-20240216

2024-02-16 08:47:13 -05:00

statsd.py

swaglog.py goes in common/ (#30631)

2023-12-06 17:27:51 -08:00

tombstoned.py

simplify git remote is comma check (#31284)

2024-02-02 21:23:32 -08:00

updated.py

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

2024-02-16 08:27:39 -05:00