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

Conflicts:
	platform/default/image.cpp

2014-11-12 23:16:56 +11:00

..

android

Renamed source files using mapbox style

2014-11-12 21:17:24 +11:00

darwin

explicitly cast to 32 bit integer

2014-11-06 15:40:16 +01:00

default

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

2014-11-12 23:16:56 +11: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