mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-03-04 00:43:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
1c43aefada1e8b8a681c2f5167b5eb207c914ecc
dragonpilot/cereal
History
dragonpilot 2156e48aa9 Merge branch 'devel' of https://github.com/commaai/openpilot into devel-en 
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
#	cereal/car.capnp
#	selfdrive/car/honda/carcontroller.py
#	selfdrive/car/honda/hondacan.py
#	selfdrive/car/toyota/carcontroller.py
#	selfdrive/controls/lib/driver_monitor.py
#	selfdrive/controls/lib/model_parser.py
#	selfdrive/ui/ui.c
2019-08-13 14:15:05 +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-08-13 14:15:05 +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-08-13 01:34:22 +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