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

# Conflicts:
#	apk/ai.comma.plus.offroad.apk
#	cereal/car.capnp
#	opendbc/generator/toyota/lexus_is_hybrid_2017_pt.dbc
#	opendbc/lexus_is_hybrid_2017_pt_generated.dbc
#	panda/board/safety/safety_honda.h
#	selfdrive/car/car_helpers.py
#	selfdrive/car/honda/values.py
#	selfdrive/car/toyota/carstate.py
#	selfdrive/car/toyota/interface.py
#	selfdrive/car/toyota/values.py
#	selfdrive/controls/lib/driver_monitor.py
#	selfdrive/controls/lib/lane_planner.py
#	selfdrive/locationd/paramsd.cc
#	selfdrive/ui/ui.c

2019-09-11 11:08:35 +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-09-11 11:08:35 +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 branch 'devel' of https://github.com/commaai/openpilot into devel-en

2019-09-11 11:08:35 +10: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