diff options
| author | Viktor Verebelyi <vviktor2@gmail.com> | 2020-09-22 02:32:58 +0100 |
|---|---|---|
| committer | Viktor Verebelyi <vviktor2@gmail.com> | 2020-09-22 02:32:58 +0100 |
| commit | 9325a31468a9c7760ce4a3d4ab1254bbf203c461 (patch) | |
| tree | 882c1715c831bd9de5b9eb0e205058f8f1586b4d | |
| parent | a8ee3ffa0a483bb829aaf7c6bd1d054107338210 (diff) | |
| parent | 8c951dffb4ca091498bc336119c1a0ede167f2c7 (diff) | |
| download | navit-9325a31468a9c7760ce4a3d4ab1254bbf203c461.tar.gz | |
Merge remote-tracking branch 'origin/qml-gui-wip'
# Conflicts:
# logo_catalog.svg
# navit/graphics/win32/graphics_win32.c
0 files changed, 0 insertions, 0 deletions