Mike Morris 4b9e299d06 Merge branch 'master' into fuzz-pipe ...

Conflicts:
	src/style/style_parser.cpp

2014-07-17 17:58:13 -04:00

..

glyphs/Open Sans Semibold, Arial Unicode MS Bold

update headless testing to be configurable

2014-07-08 14:38:49 -07:00

sprites

update headless testing to be configurable

2014-07-08 14:38:49 -07:00

styles

consolidate functions to only use stops

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

tiles

add logging facility and check logs in tests

2014-07-11 13:55:18 -07:00

fixture_log.cpp

Merge branch 'master' into fuzz-pipe

2014-07-17 12:44:45 -04:00

fixture_log.hpp

rename llmr => mbgl

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

fixture_request.cpp

rename llmr => mbgl

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