Merged
Conversation
Member
Author
|
Oh crap, this reverted #366 too... Let me fix that. |
Member
Author
|
Actually it doesn't look like it did revert it... I'm very confused by the commit message, but I think it's ok. Here's CI of master to confirm:
|
wjwwood
added a commit
that referenced
this pull request
Jan 15, 2019
* Revert "Migrate scalar displays (#367)" This reverts commit 9f3f3a6. * Revert "Handle FindEigen3 module's differing definitions (#370)" This reverts commit 2077b3a. * Revert "Skip the system directories when looking for OGRE (#371)" This reverts commit 61de77f. * Revert "Revert "Visibility followup for marker" (#369)" This reverts commit 712f903.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #297
This appeared to cause issues in our CI, so I'll revert and look into it when I have time. See: