Mike Morris e87a6d1871 Merge branch 'master' into android-mason ...

Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp

2014-12-03 13:07:49 -05:00

..

android

Rename lots of things

2014-12-04 01:10:43 +11:00

darwin

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

2014-12-03 22:02:55 +11:00

default

Merge branch 'master' into android-mason

2014-12-03 13:07:49 -05:00

ios

restructure gyp files

2014-10-24 16:40:08 +02:00

osx

restructure gyp files

2014-10-24 16:40:08 +02:00