Mike Morris a79afb78d8 Merge branch 'master' into style-parser-test ...

Conflicts:
	bin/build-style.js
	bin/default.style.json
	mapboxgl.gyp
	src/style/style_parser.cpp
	test/test.gyp

2014-08-11 12:42:49 -04:00

..

clipper

use std::abs

2014-05-29 13:24:26 -07:00

csscolorparser

always use std:: namespace for math functions

2014-05-14 16:40:24 +02:00

geometry

Eliminate warnings

2014-08-07 13:02:40 -07:00

libtess2

add tessellation library

2014-02-17 12:45:57 +01:00

map

don't automatically move back to main thread

2014-08-11 07:41:52 -07:00

platform

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

renderer

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

2014-08-08 12:29:56 -07:00

shader

Merge branch 'master' into symbols

2014-08-06 15:32:48 +02:00

style

Merge branch 'master' into style-parser-test

2014-08-11 12:42:49 -04:00

text

use filesource object for loading all http stuff

2014-08-08 15:08:41 +02:00

util

don't automatically move back to main thread

2014-08-11 07:41:52 -07:00