Leith Bade 42d1972732 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp

2015-01-23 11:11:04 +11:00

..

fixtures

Update styles

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

suite @ dba0f2b1fa

Use v7 styles / tests

2015-01-22 12:00:26 -08: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

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2015-01-23 11:11:04 +11:00

main.cpp

add gtest

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

merge_lines.cpp

port tests for mergeLines

2015-01-13 22:29:28 -05: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

Merge pull request #744 from mapbox/merge-roads

2015-01-14 10:12:45 -08:00

text_conversions.cpp

use nunicode conditional case mapping (lowercase)

2014-11-17 11:22:47 +01: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