Skip to content

Conversation

wilhuff
Copy link
Contributor

@wilhuff wilhuff commented Feb 6, 2018

This brings in these changes:

Update to bf7fc9986e20f664958fc227547fd8d2fdcf863e
From abseil-cpp version bf7fc9986e20f664958fc227547fd8d2fdcf863e
Update abseil-cpp to a new upstream (#754)

Update to bf7fc9986e20f664958fc227547fd8d2fdcf863e
@var-const
Copy link
Contributor

IIUC, absl/strings/CMakeLists.txt is not touched by this merge (the version currently in master is truncated from the original). Is this intentional?

Add StrCat, StrJoin and the rest of //strings from abseil-cpp (#756)

From abseil-cpp version bf7fc9986e20f664958fc227547fd8d2fdcf863e
@wilhuff
Copy link
Contributor Author

wilhuff commented Feb 6, 2018

Apologies. I had managed to push this PR up while my local modifications were in the index but otherwise uncommitted. PTAL

@var-const
Copy link
Contributor

@wilhuff Gil, I can merge this into my feature branch to make sure everything compiles/works correctly, but feel free to merge without waiting for that.

@wilhuff
Copy link
Contributor Author

wilhuff commented Feb 6, 2018

I'll wait for travis to confirm my local builds before merging to master.

@wilhuff wilhuff merged commit 20d6b9f into master Feb 6, 2018
@wilhuff wilhuff deleted the wilhuff/merge branch February 6, 2018 19:02
minafarid pushed a commit to minafarid/firebase-ios-sdk that referenced this pull request Jun 6, 2018
@firebase firebase locked and limited conversation to collaborators Nov 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants