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

Conflicts:
	platform/default/http_request_baton_curl.cpp

2014-12-10 19:13:21 +11:00

..

certificates.gypi

allow installing the library

2014-10-27 10:12:30 -04:00

common.gypi

Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason

2014-11-09 00:35:52 +11:00

install.gypi

nu_static_libs

2014-12-08 12:24:57 -08:00

mbgl-android.gypi

Fix missing shader cache path

2014-12-08 20:20:16 +11:00

mbgl-core.gypi

report version number in user agent string

2014-12-08 16:21:15 +01:00

mbgl-headless.gypi

make most headers private

2014-12-04 20:02:50 +01:00

mbgl-ios.gypi

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

2014-12-10 19:13:21 +11:00

mbgl-linux.gypi

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

2014-12-10 19:13:21 +11:00

mbgl-osx.gypi

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

2014-12-10 19:13:21 +11:00

mbgl-platform.gypi

Add JNI code to build system

2014-11-05 22:53:48 +11:00

merge_static_libs.py

create and install libmbgl.a with bundled libuv

2014-10-29 14:54:13 -04:00

shaders.gypi

remove dependency on node

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

styles.gypi

only the linux app needs 'copy-styles'

2014-10-31 17:14:30 -04:00

version.gypi

don't print more information when a tag actually is available

2014-12-08 16:59:02 +01:00