Commit Graph

6 Commits

Author SHA1 Message Date
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
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
682eaec87c add icon render test 2014-07-15 18:08:14 -07:00
Mike Morris
973a2f5550 fix quotes in log output 2014-07-15 14:00:38 -04:00
Konstantin Käfer
fbec72cd47 allow formatted messages 2014-07-11 16:25:20 -07:00
Konstantin Käfer
f3c55eba9d add logging facility and check logs in tests 2014-07-11 13:55:18 -07:00