John Firebaugh 1cf5af9c31 Merge remote-tracking branch 'origin/1369-alternate-fix'

2015-05-08 11:20:10 -07:00

..

api

Resize view from map thread

2015-04-28 14:32:24 -04:00

fixtures

Remove Environment::terminate and associated code

2015-04-28 09:16:26 -04:00

headless

Fix potential crash

2015-05-01 18:25:41 -04:00

ios

clear location services prompt if needed

2015-05-05 16:33:12 -07:00

miscellaneous

make WorkRequests cancelable

2015-05-08 16:43:18 +02:00

storage

don't trigger a HTTP request twice

2015-05-08 11:30:26 +02:00

suite @ fe4b1ff371

Revert test/suite submodule to intended hash

2015-05-05 14:49:43 -07:00

test.gypi

don't trigger a HTTP request twice

2015-05-08 11:30:26 +02:00