Merge branch 'master' into windows-unicode

This commit is contained in:
artemp 2016-08-12 09:31:29 +01:00
commit cdad126fa3
3 changed files with 3 additions and 3 deletions

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit 8e2f6964157885f1655c1673d65f3aea9b90fe18 Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0

@ -1 +1 @@
Subproject commit e74f1cef09d579d6ff414cb56970adbe43b7a91b Subproject commit ca5716fcef3ed33b319d3047f7d8190bf6ed6081

@ -1 +1 @@
Subproject commit 48c10bbef90017f94ab529c43287d8bb84f14159 Subproject commit bb0a8927f4305df861d1b5c6366216bb4e530975