Dragonpilot e3bb1a9f05 Merge branch 'devel' of https://github.com/commaai/openpilot into devel-en ...

# Conflicts:
#	apk/ai.comma.plus.offroad.apk
#	cereal/car.capnp
#	selfdrive/car/car_helpers.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/controls/lib/driver_monitor.py
#	selfdrive/manager.py

2019-07-23 10:55:28 +10:00

..

include

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

__init__.py

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

.gitignore

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

car.capnp

Merge branch 'devel' of https://github.com/commaai/openpilot into devel-en

2019-07-23 10:55:28 +10:00

generate_javascript.sh

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

install_capnp.sh

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

log.capnp

Merge cereal subtree

2019-07-22 19:15:25 +00:00

Makefile

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00

maptile.capnp

Merge commit '24e096d9f0f424c22b616b43957a5fd310f4ee83' as 'cereal'

2019-06-28 21:09:10 +00:00