discountchubbs aa74e67330 # Conflicts: ...

#	selfdrive/ui/layouts/main.py
#	selfdrive/ui/sunnypilot/layouts/settings/cruise.py
#	selfdrive/ui/sunnypilot/layouts/settings/display.py
#	selfdrive/ui/sunnypilot/layouts/settings/models.py
#	selfdrive/ui/sunnypilot/layouts/settings/navigation.py
#	selfdrive/ui/sunnypilot/layouts/settings/osm.py
#	selfdrive/ui/sunnypilot/layouts/settings/steering.py
#	selfdrive/ui/sunnypilot/layouts/settings/sunnylink.py
#	selfdrive/ui/sunnypilot/layouts/settings/trips.py
#	selfdrive/ui/sunnypilot/layouts/settings/vehicle.py
#	selfdrive/ui/sunnypilot/layouts/settings/visuals.py
#	system/ui/sunnypilot/widgets/option_control.py

2025-11-21 16:25:58 -08:00

..

athena

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

2025-11-16 02:50:28 -05:00

camerad

camerad: faster exposure convergence at startup (#36424)

2025-10-22 15:35:58 -07:00

hardware

Merge remote-tracking branch 'openpilot/master' into nov-19-sync

2025-11-21 09:42:54 -08:00

loggerd

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

2025-11-16 02:50:28 -05:00

manager

Merge remote-tracking branch 'openpilot/master' into nov-19-sync

2025-11-21 09:42:54 -08:00

qcomgpsd

merge a bunch of misc stuff into common.utils (#36463)

2025-10-24 20:45:56 -07:00

sensord

sensord: magnetometer is only for tizi

2025-11-18 10:10:32 -08:00

tests

ci: faster unit_test (#34019)

2024-11-13 21:27:23 -08:00

ubloxd

this is not a good api

2025-11-05 18:55:50 -08:00

ui

# Conflicts:

2025-11-21 16:25:58 -08:00

updated

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

2025-11-16 02:50:28 -05:00

webrtc

improve webrtc stack for use in camera focusing (#36268)

2025-10-08 22:30:32 -07:00

__init__.py

Move selfdrive/hardware/ to system/ (#24725)

2022-06-11 16:38:24 -07:00

journald.py

Rewrite logcatd in Python (#36111)

2025-09-07 11:32:44 -07:00

logmessaged.py

logmessaged: remove the redundant nested print (#32872)

2024-06-29 17:34:46 -07:00

micd.py

merge a bunch of misc stuff into common.utils (#36463)

2025-10-24 20:45:56 -07:00

proclogd.py

Rewrite proclogd in Python (#36110)

2025-09-07 11:13:39 -07:00

sentry.py

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

2025-08-02 00:21:14 -04:00

statsd.py

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

2025-11-16 02:50:28 -05:00

timed.py

[bot] Update Python packages (#34376)

2025-01-13 09:38:17 -08:00

tombstoned.py

move sentry/stats to system/ (#32490)

2024-05-20 22:39:25 -07:00

version.py

Merge remote-tracking branch 'openpilot/master' into nov-19-sync

2025-11-21 09:42:54 -08:00