Commit Graph

5 Commits

Author SHA1 Message Date
Dane Springmeyer
9d81fa9c63 ensure zlib headers are installed 2014-06-04 18:46:24 -07:00
Dane Springmeyer
f6df8bd54a [travis] fix linux setup 2014-06-04 18:38:59 -07:00
Dane Springmeyer
b6ed0b080a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into multi-os
Conflicts:
	.travis.yml
2014-06-03 11:17:40 -07:00
Dane Springmeyer
e0dacd465b [build] chmod +x scripts + only upgrade gcc on ubuntu precise (12.04) 2014-05-29 10:46:32 -07:00
Dane Springmeyer
e0df8c5a19 build and test on linux and osx in tandem 2014-05-29 10:17:21 -07:00