Leith Bade 6bb1a5a146 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp

2014-12-10 19:22:25 +11:00

..

build-shaders.py

remove dependency on node

2014-10-31 16:02:41 -04:00

build-version.py

don't include the source file in every library

2014-12-09 14:14:11 +01:00

compare_images.sh

call correct image compare script

2014-10-31 16:11:36 -04:00

flags.sh

disable the thread sanitizer on clang/Debug for now since this prevents core dumps from being generated on segfaults

2014-10-23 07:34:01 -07:00

local_mason.sh

add to $PATH instead of using aliases

2014-10-31 17:38:34 -04:00

npm_install.sh

pass absolute path to npm executable

2014-08-12 13:29:26 +02:00

run_tests.sh

make tests work

2014-10-24 17:44:51 +02:00

travis_before_install.sh

Go back to 7z NDK

2014-12-09 22:44:12 +11:00

travis_helper.sh

patch travis_fold and travis_nanoseconds to make it possible to test travis_helper.sh off travis

2014-11-02 15:44:33 -05:00

travis_script.sh

Use TESTMUNK in travis to start Testmunk

2014-12-03 19:46:35 +11:00