Brad Leege 8b033231d4 Merge branch 'master' into release-android-v2.4.0 ...

# Conflicts:
#	src/mbgl/map/transform.cpp

2015-12-21 18:23:38 -06:00

..

android

[android] #3354 - Incrementing Version to 3.0.0 for release

2015-12-21 12:22:43 -06:00

darwin

[ios, osx] Avoid transition to current camera

2015-12-20 03:57:51 -08:00

default

[osx] Use framebuffer width/height in GLFW port

2015-12-18 15:31:36 -08:00

ios

[ios, osx] Optional peak altitude for flying

2015-12-20 04:11:14 -08:00

linux

Move platform scripts into platforms

2015-12-16 17:49:22 -08:00

node

Move platform scripts into platforms

2015-12-16 17:49:22 -08:00

osx

[ios, osx] Optional peak altitude for flying

2015-12-20 04:11:14 -08:00