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

..

android

Read styles from APK

2014-11-17 23:17:22 +11:00

darwin

restructure gyp files

2014-10-24 16:40:08 +02:00

default

image_readers: premultiply alpha

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

event.hpp

Add coffeecatch to Map::run()

2014-11-16 20:04:36 +11:00

gl.hpp

Check for packed depth stencil

2014-11-28 00:11:37 +11:00

log.hpp

fix compile warnings

2014-10-22 11:00:34 +02:00

platform.hpp

use the default cache location on ios to avoid writing to unwritable file system locations

2014-09-24 17:08:44 +02:00