Merge master to dev15.6 #3826
Merged
Merge master to dev15.6 #3826
Conversation
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
|
|
KevinRansom
added a commit
that referenced
this pull request
Oct 27, 2017
* Merge dev15.5 to dev15.6 (#3825) * don't update project info if the source file collection is empty (#3792) * install templates VSIX to a unique directory (#3804) * P2p references (#3777) * P2p references * Fix test * test fix * go faster stripes * new project works better * Re-add debug assert for sourcefiles * Parameterise rc location (#3744) * Fix issues * Merge master to dev15.6 (#3826) * Put nupkgs into artifacts (#3806) * Make FCS build work on Jenkins (#3788)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from master into dev15.6.
git fetch --all git checkout merges/master-to-dev15.6-20171026-065954 git reset --hard upstream/dev15.6 git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-dev15.6-20171026-065954 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.