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

..

clipper

gcc fixes

2014-10-23 02:46:15 -07:00

csscolorparser

don't use std::map for checking color constants

2014-10-30 16:43:36 -04:00

geometry

load VAO extension

2014-11-07 18:17:24 +01:00

libtess2

GCC doesn't like #pragmas between the function declaration and definition

2014-10-22 04:17:43 -07:00

map

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

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

platform

load VAO extension

2014-11-07 18:17:24 +01:00

renderer

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

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

shader

gyp fixes

2014-10-28 12:47:58 -04:00

storage

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

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

style

Single text positioning property

2014-11-04 12:26:27 -08:00

text

fix variable shadowing

2014-10-22 18:19:01 +02:00

util

Temp disable SSL cert validation

2014-11-08 08:44:39 +11:00