John Firebaugh 5eda74a514 Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:43:37 -07:00

..

img

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

Settings.bundle

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

app-info.plist

[ios] Converted iosapp to use storyboard

2016-03-10 17:08:58 -08:00

main.m

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

mapboxgl-app.gypi

[ios] Fixed iosapp build

2016-03-10 20:22:19 -08:00

MBXAppDelegate.h

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXAppDelegate.m

[ios] Converted iosapp to use storyboard

2016-03-10 17:08:58 -08:00

MBXCustomCalloutView.h

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXCustomCalloutView.m

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXOfflinePacksTableViewController.h

[ios] Renamed downloads to offline packs in iosapp

2016-03-10 17:14:14 -08:00

MBXOfflinePacksTableViewController.m

[ios, osx] Require progress to be requested manually

2016-03-29 11:46:27 -07:00

MBXViewController.h

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXViewController.mm

[ios] explicitly load the style when the app loads

2016-03-22 11:19:58 -07:00

points.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

polyline.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

Storyboard.storyboard

[ios] Renamed downloads to offline packs in iosapp

2016-03-10 17:14:14 -08:00

threestates.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00