Merge branch 'master' into rasterize

[skip ci]
This commit is contained in:
Konstantin Käfer
2014-08-12 15:12:03 +02:00
28 changed files with 261 additions and 234 deletions

View File

@@ -7,7 +7,7 @@
#include <mbgl/platform/platform.hpp>
#include <mbgl/platform/gl.hpp>
#include <mbgl/util/time.hpp>
#include <mbgl/util/uv.hpp>
#include <mbgl/util/uv_detail.hpp>
#include <mbgl/util/std.hpp>
#include <png.h>