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

Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp

2014-11-09 00:35:52 +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

fix gyp project

2014-10-30 15:06:10 -04:00

mbgl-android.gypi

Start working on android log hook

2014-11-07 01:39:44 +11:00

mbgl-core.gypi

use CoreImage for decoding/encoding images on osx/ios

2014-10-30 12:02:28 -04:00

mbgl-headless.gypi

mark static libs as standalone

2014-10-29 12:00:01 -04:00

mbgl-ios.gypi

use CoreImage for decoding/encoding images on osx/ios

2014-10-30 12:02:28 -04:00

mbgl-linux.gypi

fix boost includes and allow any platform builds for xcode test project

2014-11-05 12:13:24 +01:00

mbgl-osx.gypi

use CoreImage for decoding/encoding images on osx/ios

2014-10-30 12:02:28 -04: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