diff options
| author | mvglasow <michael -at- vonglasow.com> | 2021-01-23 23:40:08 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2021-01-23 23:40:08 +0200 |
| commit | d5f9db8cd63398ee8a42e80e4381d4f1a35b2116 (patch) | |
| tree | c89cd6957f89083b41a26bac5571d027baacfc62 /navit/vehicle/android/vehicle_android.c | |
| parent | 9a96b0907272069ce60d08436255936cd1ca2f87 (diff) | |
| parent | 91222b892b2f796b8c18dff13eb15f888b276f3b (diff) | |
| download | navit-d5f9db8cd63398ee8a42e80e4381d4f1a35b2116.tar.gz | |
Merge branch 'master' into traff_0_8
# Conflicts:
# navit/android/AndroidManifest.xml.cmake
Diffstat (limited to 'navit/vehicle/android/vehicle_android.c')
0 files changed, 0 insertions, 0 deletions