summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trunk' into multipolygonmultipolygonStefan Wildemann2019-09-021-17/+20
|\
| * Merge pull request #850 from mvglasow/bikemvglasow2019-09-021-17/+20
| |\
| | * Merge branch 'trunk' into bikemvglasow2019-08-315-20/+15
| | |\ | | |/ | |/|
| | * Fix:xml:Fix bike routingmvglasow2019-08-281-17/+20
* | | Merge branch 'trunk' into multipolygonStefan Wildemann2019-09-015-20/+15
|\ \ \ | |/ /
| * | typo:xml: Fix a typo of the OpenStreetMap name in the shipped XML (#857)Joseph Herlant2019-08-311-1/+1
| * | refactoring:tools:remove unnecessary trailing line to make codefactor happyJoseph Herlant2019-08-311-1/+0
| * | Refactoring:tools: Check exit code directly with e.g. "if mycmd;", not indire...Joseph Herlant2019-08-313-18/+14
| |/
* | Add:graphics/windows: draw polygon with holes (#855)Stefan Wildemann2019-08-291-0/+63
* | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-284-1/+3
|\ \ | |/
| * Add Kosovo to known countriesWildemann Stefan2019-08-283-0/+2
| * update:build:sailfish OS to version 3.1.0.12 (#843)Patrick Höhn2019-08-271-1/+1
* | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-274-4/+59
|\ \ | |/
| * Add:doc:Migrate the commit guidelines document to readthedocs (#841)Joseph Herlant2019-08-234-4/+59
* | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-223-5/+5
|\ \ | |/
| * Merge pull request #839 from mvglasow/github827mvglasow2019-08-222-4/+4
| |\
| | * Add:build:Print error messages to stderrmvglasow2019-08-221-1/+1
| | * Merge branch 'trunk' into github827mvglasow2019-08-221-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #838 from mvglasow/github836mvglasow2019-08-221-1/+1
| |\ \
| | * \ Merge branch 'trunk' into github836mvglasow2019-08-213-52/+76
| | |\ \ | | |/ / | |/| |
| | * | Fix:graphics/android:Remove faulty debug statement causing crashesmvglasow2019-08-211-1/+1
| | | * Merge branch 'trunk' into github827mvglasow2019-08-2113-205/+924
| | | |\ | | |_|/ | |/| |
| | | * Fix:toolchain:Remove privileged operation from build scriptmvglasow2019-08-212-4/+4
* | | | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-211-1/+2
|\ \ \ \ | |/ / /
| * | | Issue/826 (#837)gefin2019-08-211-1/+2
* | | | Add struct traffic *traffic; lost on trunk merge conflictmetalstrolch2019-08-201-0/+1
* | | | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-201-22/+51
|\ \ \ \ | |/ / /
| * | | Merge pull request #817 from navit-gps/fix_cursor_layer_sizeStefan Wildemann2019-08-201-22/+51
| |\ \ \
| | * \ \ Merge branch 'trunk' into fix_cursor_layer_sizeStefan Wildemann2019-08-2011-155/+855
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Fix some typos.fix_cursor_layer_sizemetalstrolch2019-08-181-2/+2
| | * | | Merge branch 'trunk' into fix_cursor_layer_sizeStefan Wildemann2019-08-1621-168/+456
| | |\ \ \
| | * | | | fix: vehicle: Increase layer for cursor for rotationWildemann Stefan2019-07-231-22/+51
* | | | | | Merge branch 'trunk' into multipolygonStefan Wildemann2019-08-2010-155/+854
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reverting part of e7a70e9dc04b94b47fb7786aab4edfd25132c70f (PR #833) that was...lains2019-08-201-29/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Reverting part of e7a70e9dc04b94b47fb7786aab4edfd25132c70f (PR #833) that was...Lionel AINS2019-08-201-29/+23
| |/ / / /
| * | | | Merge pull request #822 from navit-gps/trafficmvglasow2019-08-2010-153/+848
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'trunk' into traffictrafficmvglasow2019-08-202-25/+36
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Fix: Fix pkgconfig detection, and multiple subsequent build for Android (#833)lains2019-08-202-25/+36
| | |_|/ | |/| |
| | * | Merge branch 'trunk' into trafficmvglasow2019-08-1919-158/+442
| | |\ \ | | |/ / | |/| |
| | * | Refactor:traffic:Make sanity check happymvglasow2019-08-161-9/+9
| | * | Fix:traffic:When restoring items, iterate over mapset only oncemvglasow2019-08-161-137/+184
| | * | Fix:traffic:Make Android build happymvglasow2019-08-121-6/+3
| | * | Add:traffic:Preserve cached items even if they were not restoredmvglasow2019-08-121-2/+4
| | * | Fix:traffic:Make sanity check happymvglasow2019-08-121-3/+3
| | * | Fix:traffic:Add forgotten linemvglasow2019-08-121-1/+0
| | * | Fix:traffic:Always free up priv->txt_data in location destructormvglasow2019-08-121-0/+2
| | * | Add:traffic:Lazy restore for cached itemsmvglasow2019-08-121-31/+53
| | * | Fix:traffic:Write cached flags so they will parse without warningsmvglasow2019-08-111-4/+9
| | * | Add:traffic:Debug output about segmented itemsmvglasow2019-08-111-0/+1
| | * | Add:traffic:Match restored items to map data, discard if no matchmvglasow2019-08-101-3/+138