Mike Morris a79afb78d8 Merge branch 'master' into style-parser-test ...

Conflicts:
	bin/build-style.js
	bin/default.style.json
	mapboxgl.gyp
	src/style/style_parser.cpp
	test/test.gyp

2014-08-11 12:42:49 -04:00

..

fixtures

Merge branch 'master' into style-parser-test

2014-08-11 12:42:49 -04:00

clip_ids.cpp

rename llmr => mbgl

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

comparisons.cpp

rename llmr => mbgl

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

enums.cpp

fix enum tests

2014-07-31 19:06:15 +02:00

functions.cpp

consolidate functions to only use stops

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

headless.cpp

Use mapbox-gl-test-suite

2014-07-21 11:31:31 -07: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

add line-width and bad colors fixtures

2014-07-18 17:35:30 -04:00

test.gyp

Merge branch 'master' into style-parser-test

2014-08-11 12:42:49 -04:00

tile.cpp

rename llmr => mbgl

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

variant.cpp

rename llmr => mbgl

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