Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into vector tiles #6083

Conversation

gberaudo
Copy link
Contributor

@gberaudo gberaudo commented Jan 3, 2018

Merge the newly released v1.41 into vector tiles.
This merge allows people relying on the vector-tiles branch to publish their own packages.
This is similar to #5960, #5875 and #5810.

Merge conflicts related to the cliping planes in two files were fixed:

  • CHANGES.md (used the version from the vector-tiles branch which was more detailed);
  • Source/Scene/Cesium3DTileset.js (the note about Internet Explorer compatibility was added).

@cesium-concierge
Copy link

Signed CLA is on file.

@gberaudo, thanks for the pull request! Maintainers, we have a signed CLA from @gberaudo, so you can review this at any time.


I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome.

🌍 🌎 🌏

@gberaudo gberaudo force-pushed the merge_master_into_vector_tiles branch from 22251d0 to f35599d Compare January 4, 2018 15:53
@gberaudo
Copy link
Contributor Author

gberaudo commented Jan 4, 2018

Thanks @bagnell. Closing as already done through the merge of 3d-tiles-vector into vector-tile.

@gberaudo gberaudo closed this Jan 4, 2018
@gberaudo gberaudo deleted the merge_master_into_vector_tiles branch January 4, 2018 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants