Brad Leege 1972d932d5 Merge branch 'release-android-v4.1.1' ...

# Conflicts:
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	test/util/mapbox.cpp

2016-07-19 16:32:45 -05:00

..

async_task.cpp

[core] fix pedantic warning messages

2016-06-13 11:16:19 +02:00

geo.cpp

[core] move TileData and dependents to new *TileID classes

2016-05-10 14:50:56 +02:00

image.cpp

[core] fix pedantic warning messages

2016-06-13 11:16:19 +02:00

mapbox.cpp

[android] #5725 - Cherry picking 559f3a654b

2016-07-19 13:31:11 -05:00

memory.cpp

[tests] Add memory tests

2016-06-21 19:12:32 +02:00

merge_lines.cpp

[core] implement queryRenderedFeatures

2016-04-29 12:00:24 -07:00

number_conversions.cpp

[core] use rapidjson's dtoa implementation to stringify floating point numbers

2016-05-18 12:26:51 +02:00

projection.cpp

[test] Added Projection tests

2016-06-13 10:11:20 +03:00

run_loop.cpp

[test] rearrange test files so they're not in the fixtures folder

2016-03-22 11:56:01 -07:00

text_conversions.cpp

[test] rearrange test files so they're not in the fixtures folder

2016-03-22 11:56:01 -07:00

thread_local.cpp

[tidy] Check modernize-use-auto

2016-06-13 23:32:06 +03:00

thread.cpp

[core] Clean up ThreadContext vestiges

2016-04-15 09:56:18 -07:00

tile_cover.cpp

[core] remove MockView and View dependency in Transform

2016-05-18 12:07:21 +02:00

timer.cpp

Revert "[android] Do not create Timers on Default main loops"

2016-07-06 17:43:09 +03:00

token.cpp

[core] Allow the use of special characters in property field names

2016-03-23 17:15:18 -07:00

work_queue.cpp

[core] Clean up ThreadContext vestiges

2016-04-15 09:56:18 -07:00