Leith Bade 70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp

2014-11-09 00:35:52 +11:00

..

fixtures

Update styles

2014-11-04 12:26:14 -08:00

suite @ b94ae79bb1

use IPv4 address instead of localhost to work around systems that don't resolve localhost to 127.0.0.1

2014-11-06 13:05:51 +01:00

clip_ids.cpp

compute unique clip ids per tile, taking covering children into account

2014-08-21 15:02:08 +02:00

comparisons.cpp

Implement v6 filters

2014-11-04 12:26:14 -08:00

enums.cpp

remove erroneous output during test run

2014-10-22 16:30:06 +02:00

functions.cpp

consolidate functions to only use stops

2014-07-17 14:32:35 -07:00

headless.cpp

[linux] let child process exit when parent hung up

2014-11-06 13:06:01 +01:00

main.cpp

add gtest

2014-03-17 12:32:27 +01:00

rotation_range.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

style_parser.cpp

use ASSERT_FALSE for boolean comparisons

2014-10-22 04:20:51 -07:00

test.gyp

add boost headers to cflags_cc for text_conversions test

2014-11-07 12:20:40 -05:00

text_conversions.cpp

add basic toupper/tolower text conversions tests #309

2014-11-04 14:53:45 +00:00

tile.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

variant.cpp

Implement v6 filters

2014-11-04 12:26:14 -08:00