Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Merge Android 3.0.0 Release Branch Back To Master #3372

Closed
bleege opened this issue Dec 21, 2015 · 2 comments
Closed

Merge Android 3.0.0 Release Branch Back To Master #3372

bleege opened this issue Dec 21, 2015 · 2 comments
Assignees
@bleege
Labels
Android Mapbox Maps SDK for Android
Milestone
android-v3.1.0

Comments

@bleege
Copy link
Contributor

bleege commented Dec 21, 2015

Mapbox Android 3.0.0 was released in #3354 and now it's release branch needs to be merged back into master for development to continue.

The release branch was label release-android-v2.4.0 as it was originally thought to be version 2.4.0.

https://github.com/mapbox/mapbox-gl-native/commits/release-android-v2.4.0

/cc @mapbox/mobile
@bleege bleege added the Android Mapbox Maps SDK for Android label Dec 21, 2015
@bleege bleege self-assigned this Dec 21, 2015
@bleege bleege added this to the android-v3.1.0 milestone Dec 21, 2015
@bleege bleege mentioned this issue Dec 21, 2015
Merged
@bleege
Copy link
Contributor Author

bleege commented Dec 22, 2015

The only conflict while merging was to src/mbgl/map/transform.cpp, to which my solution was to accept the changes from master completely so there should be no change at all to it. Other than that the merge was clean.

/cc @jfirebaugh @1ec5

@1ec5
Copy link
Contributor

1ec5 commented Dec 22, 2015

Yep, that’s good because I merely cherry-picked some changes over to the release branch from master. 👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@bleege bleege

Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Milestone
android-v3.1.0
Development

No branches or pull requests
3 participants
@mourner @bleege @1ec5