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

Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp

2014-11-28 01:51: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

add jpeg_static_libs to linux install ldflags

2014-11-26 10:00:48 -08:00

mbgl-android.gypi

Fix jpeg android gyp

2014-11-28 00:15:05 +11:00

mbgl-core.gypi

"skip install" for lib Xcode targets for easier app archiving

2014-11-11 14:59:01 -08:00

mbgl-headless.gypi

mark static libs as standalone

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

mbgl-ios.gypi

"skip install" for lib Xcode targets for easier app archiving

2014-11-11 14:59:01 -08:00

mbgl-linux.gypi

Fix jpeg android gyp

2014-11-28 00:15:05 +11: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