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

..

applied_class_properties.cpp

rename llmr => mbgl

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

class_dictionary.cpp

rename llmr => mbgl

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

class_properties.cpp

rename llmr => mbgl

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

filter_comparison.cpp

rename llmr => mbgl

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

filter_expression.cpp

rename llmr => mbgl

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

function_properties.cpp

rename llmr => mbgl

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

property_fallback.cpp

rename llmr => mbgl

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

style_bucket.cpp

rename llmr => mbgl

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

style_layer_group.cpp

rename llmr => mbgl

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

style_layer.cpp

rename llmr => mbgl

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

style_parser.cpp

Merge branch 'master' into fuzz-pipe

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

style_properties.cpp

rename llmr => mbgl

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

style.cpp

rename llmr => mbgl

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

types.cpp

add enum class to unify parsing/stringification

2014-07-14 16:33:02 -07:00

value.cpp

rename llmr => mbgl

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