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

Conflicts:
	Makefile
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp

2014-12-21 15:02:47 +13:00

..

application_root.cpp

change comment and cache value

2014-12-17 15:01:15 +01:00

asset_request_libuv.cpp

Fix build

2014-12-18 20:35:55 +11:00

cache_database_tmp.cpp

restructure gyp files

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

glfw_view.cpp

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

2014-12-21 15:02:47 +13:00

headless_display.cpp

Tidy up HeadlessView

2014-12-09 21:47:30 +11:00

headless_view.cpp

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

2014-12-21 15:02:47 +13:00

http_request_baton_curl.cpp

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

2014-12-10 19:13:21 +11:00

image_reader.cpp

add array overloads to make_unique and move it to mbgl::util from std

2014-12-03 11:27:24 +01:00

image.cpp

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

2014-12-03 22:02:55 +11:00

jpeg_reader.cpp

image-readers: move concrete implementations headers into platform/default

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

log_stderr.cpp

restructure gyp files

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

png_reader.cpp

image_readers: premultiply alpha

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

settings_json.cpp

switch to plain file streams rather than JSON

2014-12-04 20:00:41 +01:00

shader_cache_tmp.cpp

Load program binary extension on Linux

2014-12-06 14:21:08 +11:00

string_stdlib.cpp

use ``const var&`` notation in public interface

2014-11-27 18:11:18 +01:00