Jason Wen dba3eb7a50 fix upstream conflict

2023-05-25 12:50:37 -04:00

..

assets

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

athena

athenad: add getGithubUsername method (#28025)

2023-04-26 20:42:43 -07:00

boardd

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

car

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

controls

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

debug

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

gpxd

gpxd: remove secret (#135)

2023-03-26 12:01:31 -04:00

locationd

QCOM laikad: add glonass support (#28217)

2023-05-18 00:19:40 -07:00

manager

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

mapd

mapd: add Germany to offline OSM database list (#70)

2023-04-28 03:32:24 -04:00

modeld

update DM model README (#28211)

2023-05-16 13:40:49 -07:00

monitoring

Merge branch 'upstream/openpilot/master'

2023-05-25 12:17:54 -04:00

navd

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

test

Merge branch 'master' into dev-priv/master

2023-05-25 12:39:32 -04:00

thermald

Merge branch 'upstream/openpilot/master'

2023-05-25 12:17:54 -04:00

ui

fix upstream conflict

2023-05-25 12:50:37 -04:00

__init__.py

…

hardware

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

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

rtshield.py

paramsd: fix variable cpu usage (#24281)

2022-04-20 14:08:52 -07:00

sentry.py

General: Sentry logging

2023-01-29 21:59:55 -05:00

statsd.py

loggerd: move to system/ (#27534)

2023-03-08 11:20:49 -08:00

tombstoned.py

loggerd: move to system/ (#27534)

2023-03-08 11:20:49 -08:00

updated.py

updated: fix brief notification of update for same version (#27182)

2023-02-02 10:25:20 -08:00