discountchubbs 95762333d5 # Conflicts: ...

#	selfdrive/ui/sunnypilot/mici/layouts/settings.py
#	selfdrive/ui/sunnypilot/mici/layouts/sunnylink.py
#	selfdrive/ui/sunnypilot/mici/widgets/sunnylink_pairing_dialog.py
#	selfdrive/ui/sunnypilot/ui_state.py

2025-12-19 05:53:07 -08:00

..

feedback

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

2025-08-24 14:52:21 -04:00

installer

installer: use release-mici for comma four

2025-11-20 17:06:24 -08:00

layouts

Merge remote-tracking branch 'origin/master' into only-chubbs

2025-12-13 07:12:55 -08:00

lib

Fix raylib ui spamming API calls (#36745)

2025-12-01 21:13:43 -08:00

mici

# Conflicts:

2025-12-19 05:53:07 -08:00

onroad

# Conflicts:

2025-12-19 05:53:07 -08:00

sunnypilot

# Conflicts:

2025-12-19 05:53:07 -08:00

tests

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

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

translations

ui: feature Ukrainian translation (#36646)

2025-12-08 16:40:29 -08:00

widgets

raylib: minor tweaks (#36507)

2025-10-27 19:59:35 -07:00

__init__.py

raylib: minor tweaks (#36507)

2025-10-27 19:59:35 -07:00

.gitignore

ui: cleanup .gitignore (#36471)

2025-10-24 22:00:38 -07:00

SConscript

comma four (#36639)

2025-11-18 22:27:45 -08:00

soundd.py

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

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

ui_state.py

# Conflicts:

2025-12-19 05:53:07 -08:00

ui.py

use gui_app.sunnypilot_ui()

2025-11-21 17:55:00 -05:00

update_translations.py

fix: badges (#36566)

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

watch3.py

ui: move watch3 to raylib (#35967)

2025-08-09 15:00:36 -07:00