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

Conflicts:
	bin/package.json
	src/style/style_parser.cpp
	test/fixtures/fixture_log.cpp
	test/test.gyp

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

..

fixtures

Merge branch 'master' into fuzz-pipe

2014-07-17 12:44:45 -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

rename llmr => mbgl

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

functions.cpp

rename llmr => mbgl

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

headless.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -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.cpp

Merge branch 'master' into fuzz-pipe

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

test.gyp

Merge branch 'master' into fuzz-pipe

2014-07-17 12:44:45 -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