Antonio Zugaldia 7756f7727c Merge remote-tracking branch 'mapbox/master' into 2317-espresso ...

Conflicts:
	android/java/MapboxGLAndroidSDKTestApp/build.gradle

2015-09-14 17:24:59 -04:00

..

annotations

Report Sprite parsing errors to Observers

2015-07-10 10:48:46 +03:00

api

Consolidate test-suite rendering harnesses (#2236)

2015-09-04 10:52:14 -07:00

fixtures

View::swap -> View::beforeRender View::afterRender

2015-08-25 14:39:49 -04:00

ios

Disabled iOS metrics tests

2015-08-31 15:45:14 -07:00

miscellaneous

Consolidate test-suite rendering harnesses (#2236)

2015-09-04 10:52:14 -07:00

storage

Do not force uv_loop_t as the first parameter for a threaded object ctor

2015-07-06 16:01:59 +03:00

style

fixes #1675: abstract annotation tile refresh check/render; trigger post-sprite/sprite store load

2015-09-08 18:03:10 -07:00

suite @ 35c52c078c

Consolidate test-suite rendering harnesses (#2236)

2015-09-04 10:52:14 -07:00

test.gypi

Consolidate test-suite rendering harnesses (#2236)

2015-09-04 10:52:14 -07:00