John Firebaugh 5eda74a514 Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:43:37 -07:00

..

api

[ios] make unit tests work on iOS and iOS Simulator

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

fixtures

Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:43:37 -07:00

geometry

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

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

include/mbgl/test

[core] Unify FileRequest and WorkRequest

2016-03-24 10:54:32 -07:00

map

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

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

sprite

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

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

src

[core] Unify FileRequest and WorkRequest

2016-03-24 10:54:32 -07:00

storage

Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:43:37 -07:00

style

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

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

util

[core] Unify FileRequest and WorkRequest

2016-03-24 10:54:32 -07:00

test.gypi

[tests] fix make iproj copy phase for unit text fixtures

2016-03-22 17:06:33 -07:00