Ansis Brammanis ff6a5ce5bc Merge remote-tracking branch 'origin/master' into new-labelling ...

Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite

2015-05-28 20:01:15 -04:00

..

application_root.cpp

execute the correct server path and use the exepath for application root rather than the cwd

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

asset_request_fs.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

asset_request_zip.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

asset_root.cpp

refactor makefile

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

default_styles.cpp

Remove currently unsupported styles from defaultStyles

2015-05-12 16:42:26 -07:00

default_styles.hpp

Add style change functionality to the Linux test app

2015-05-07 11:01:15 +02:00

glfw_view.cpp

make collision debug boxes toggleable

2015-05-28 19:17:07 -04:00

headless_display.cpp

forward declare GLX typedefs to limit conflicts from glx.h

2015-02-10 13:38:45 -08:00

headless_view.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

http_request_curl.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

image_reader.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

image.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

jpeg_reader.cpp

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

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

log_stderr.cpp

Log the Environment ID and the Thread name

2015-03-18 12:51:33 +01:00

png_reader.cpp

Speculative fix for PNG alpha/gamma handling

2015-05-14 18:02:15 -07:00

settings_json.cpp

switch to plain file streams rather than JSON

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

sqlite3.cpp

make sqlite storage more resilient to sporadic errors

2015-04-07 18:04:23 +02:00

sqlite3.hpp

make storage lib separate so we can build without storage libs

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

sqlite_cache_impl.hpp

Provide Thread objects with access to loop

2015-04-28 14:32:22 -04:00

sqlite_cache.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

string_stdlib.cpp

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

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

thread.cpp

lower thread priority of worker threads

2015-05-04 17:33:05 +02:00

uv_zip.c

update uv_zip

2015-02-17 11:42:55 -08:00

uv_zip.h

refactor makefile

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