Brad Leege 044d1fc3c2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics ...

Conflicts:
	gyp/platform-ios.gypi
	platform/ios/MGLMapView.mm
	styles

2015-03-23 10:52:27 -05:00

..

asset-fs.gypi

update uv_zip and add tests

2015-02-16 18:30:19 -08:00

asset-zip.gypi

update uv_zip and add tests

2015-02-16 18:30:19 -08:00

cache-sqlite.gypi

fix sprites for pixel ratios that are not 1 and 2

2015-03-17 12:30:40 +01:00

certificates.gypi

allow installing the library

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

common.gypi

fixes black flicker on rotating the device

2015-03-12 12:16:38 +01:00

core.gypi

scripts for running linux tests with docker

2015-03-13 12:06:11 +01:00

headless-cgl.gypi

refactor makefile

2015-02-04 10:49:09 +01:00

headless-glx.gypi

scripts for running linux tests with docker

2015-03-13 12:06:11 +01:00

http-curl.gypi

scope Requests to an Environment object for easier cancelation

2015-03-06 08:21:47 -08:00

http-nsurl.gypi

scope Requests to an Environment object for easier cancelation

2015-03-06 08:21:47 -08:00

install.gypi

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

link.py

don't drop -L flags

2015-02-04 10:49:09 +01:00

load.gypi

refactor makefile

2015-02-04 10:49:09 +01:00

merge_static_libs.py

create and install libmbgl.a with bundled libuv

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

none.gypi

refactor makefile

2015-02-04 10:49:09 +01:00

platform-android.gypi

Add assetRoot for Android

2015-02-10 19:33:22 -08:00

platform-ios.gypi

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics

2015-03-23 10:52:27 -05:00

platform-linux.gypi

cleanup makefiles

2015-02-04 11:54:01 +01:00

platform-osx.gypi

scripts for running linux tests with docker

2015-03-13 12:06:11 +01:00

shaders.gypi

chmod +x python builds scripts, run directly instead of with python gyp var

2015-02-10 14:09:32 -08:00

standalone.gypi

refactor makefile

2015-02-04 10:49:09 +01:00

styles.gypi

Make file request overridable by platform implementations

2014-12-17 12:14:32 +01:00

version.gypi

chmod +x python builds scripts, run directly instead of with python gyp var

2015-02-10 14:09:32 -08:00