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

Merge Release Android V4.1.1 Branch To Master #5728

Merged
merged 4 commits into from
Jul 19, 2016
Merged

Conversation

bleege
Copy link
Contributor

@bleege bleege commented Jul 19, 2016

Closes #5725

@bleege bleege added the Android Mapbox Maps SDK for Android label Jul 19, 2016
@bleege bleege added this to the android-v4.1.1 milestone Jul 19, 2016
@bleege bleege self-assigned this Jul 19, 2016
@mention-bot
Copy link

@bleege, thanks for your PR! By analyzing the annotation information on this pull request, we identified @kkaefer, @jingsam and @1ec5 to be potential reviewers

@bleege bleege merged commit 5ef2cbf into master Jul 19, 2016
@bleege
Copy link
Contributor Author

bleege commented Jul 19, 2016

Merged with master after resolving two minor conflicts:

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   platform/android/MapboxGLAndroidSDK/gradle.properties
    both modified:   test/util/mapbox.cpp

@bleege bleege deleted the release-android-v4.1.1 branch July 19, 2016 21:34
@bleege bleege restored the release-android-v4.1.1 branch July 19, 2016 21:34
@1ec5
Copy link
Contributor

1ec5 commented Jul 19, 2016

The conflicts are likely due to #5554. (We cherry-picked both #5554 and #5723 into the iOS release branch to avoid this.)

@tobrun tobrun deleted the release-android-v4.1.1 branch August 9, 2016 02:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants