Mike Morris a79afb78d8 Merge branch 'master' into style-parser-test ...

Conflicts:
	bin/build-style.js
	bin/default.style.json
	mapboxgl.gyp
	src/style/style_parser.cpp
	test/test.gyp

2014-08-11 12:42:49 -04:00

..

flags.sh

fix automated headless testing on travis

2014-07-09 12:37:59 -07:00

npm_install.sh

dont exit early from npm_install.sh

2014-07-11 18:05:40 -07:00

run_tests.sh

add logging facility and check logs in tests

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

setup_travis.sh

fix automated headless testing on travis

2014-07-09 12:37:59 -07:00