Skip to content

Resolve syncing conflicts from master-sync-work to master #1

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 87 commits into from
Nov 16, 2016
Merged

Resolve syncing conflicts from master-sync-work to master #1

merged 87 commits into from
Nov 16, 2016

Conversation

openpublishbuild
Copy link
Contributor

Pull request opened by OPS to resolve syncing conflicts from master-sync-work to master.

Michael Blome and others added 30 commits November 12, 2016 15:51
various manual formatting fixes
2431dd4
manual formatting fixes on stl <header>-functions pages
da17f9a
Removed incorrect uses of Method in STL class docs
b0cbf81
code formatting in mfc macros
404b892
@ghogen
Merge pull request #40 from Microsoft/mblome
e3d894f 
various manual formatting fixes in stl docs
fixed incorrect indent on mfc struct topic syntax blocks
2ecd4f0
misc syntax fixes STL plus added cpp to example blocks in 207 files
db414a1
@ghogen
Merge pull request #41 from Microsoft/mblome
3f719c7 
misc syntax formatting across MFC and STL and added cpp language speicfier for examples in s stl
ATL Macro syntax fixes
68d214f
misc formatting and fixed-up TOC
9305d2a
@ghogen
Merge pull request #42 from Microsoft/mblome
897e3bb 
More ATL formatting and TOC work in reference section
@ghogen
remove ms.prod
3168772
@ghogen
Merge pull request #43 from Microsoft/ghogen-metadata
bd61948 
remove ms.prod
@ghogen
Start making index.md changes and some TOC fixes
b89c6ab
@ghogen
index.md files added in some folders
26e4b29
@ghogen
Merge branch 'master' of github.com:Microsoft/vcppdocs into ghogen-me…
7dc40c6 
…tadata
@ghogen
Revert "remove ms.prod"
b68e38d 
This reverts commit 3168772.
@ghogen
Try again ... remove ms.prod
c6dbdc6
@ghogen
Merge pull request #44 from Microsoft/ghogen-metadata
9793238 
Ghogen metadata
a few more STL code formatting fixes
6f33521
@ghogen
Add index.md as appropriate
567ae1b
@ghogen
Merge pull request #45 from Microsoft/ghogen-index
385650a 
Add index.md as appropriate
Updates to whats new
319267f
removed limits-functions because no content
01c4aa6
Make some additions to compiler options for RC
4a39c6e
Add syntax block to permissive option
b5bec10
Merge remote-tracking branch 'refs/remotes/origin/master' into colin-rc
585cdf8
New content and links for top level mfc page
e21beb5
new content for what's new in vcpp
c2e4725
new content for conformance improvements page
6224c99
@msftclas
Copy link

Hi @openpublishbuild, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution!


It looks like you're a Microsoft contributor (Open Publishing Build Service). If you're full-time, we DON'T require a Contribution License Agreement. If you are a vendor, please DO sign the electronic Contribution License Agreement. It will take 2 minutes and there's no faxing! https://cla.microsoft.com.

TTYL, MSBOT;

@ghogen ghogen merged commit 03ec106 into master Nov 16, 2016
fenxu pushed a commit that referenced this pull request Aug 18, 2017
Merge pull request #1 from corob-msft/cr-natvis
74926d3 
Update natvis linker option
fenxu pushed a commit that referenced this pull request Mar 5, 2018
@tynevi
Merge pull request #1 from MicrosoftDocs/master
090b1b4 
update from upstream
fenxu pushed a commit that referenced this pull request Aug 24, 2018
@rchiodo
Merge pull request #1 from MicrosoftDocs/master
d62fa35 
Merge from MicrosftDocs
opbld16 pushed a commit that referenced this pull request Nov 21, 2019
proofread pass #1
5ce8206
opbld17 pushed a commit that referenced this pull request May 21, 2020
@kevcadieux
Merge pull request #1 from MicrosoftDocs/master
d9fd0e6 
Merging upstream to local fork
opbld16 pushed a commit that referenced this pull request May 29, 2020
@TylerMSFT
Merge pull request #1 from TylerMSFT/StephanTLavavej-patch-1
1b7df3e 
Update span.md
opbld17 pushed a commit that referenced this pull request Aug 19, 2020
@atikmapari
Merge pull request #1 from MicrosoftDocs/master
9c457ad 
sync with master
opbld15 pushed a commit that referenced this pull request Sep 3, 2020
@v-hearya
Merge pull request #1 from MicrosoftDocs/master
0150fa8 
Syncing with MSDocs
ktoliver pushed a commit that referenced this pull request Sep 28, 2020
@definedrisk
Merge pull request #1 from MicrosoftDocs/master
375ef22 
Pulling upstream changes to master
opbld16 pushed a commit that referenced this pull request Nov 3, 2020
@v-rajagt-zz
Merge pull request #1 from MicrosoftDocs/master
0ddc812 
Syncing with master.
opbld15 pushed a commit that referenced this pull request Nov 4, 2020
@esweet431
Merge pull request #1 from esweet431/esweet431-patch-1
c7b6906 
Use make instead of Ninja
opbld17 pushed a commit that referenced this pull request Dec 1, 2020
@esweet431
Merge pull request #1 from esweet431/esweet431-patch-1
f3de8e5 
Remove defaults object
opbld17 pushed a commit that referenced this pull request Mar 8, 2021
@JimRadigan
Merge pull request #1 from JimRadigan/ericbr/asan_md_1
1e8f275 
First round of feedback for Asan.md
opbld17 pushed a commit that referenced this pull request Apr 4, 2022
@rachana-satao
Merge pull request #1 from TylerMSFT/RAS-cpp-US1921538-1
afe76a3 
Ras cpp us1921538 1
Jak-MS pushed a commit that referenced this pull request Feb 20, 2024
@stoopdapoop
Merge pull request #1 from stoopdapoop/stoopdapoop-patch-1
53601de 
Fixed syntax error in example message
learn-build-service-prod bot pushed a commit that referenced this pull request Jan 30, 2025
@PoulChapman
Merge pull request #1 from PoulChapman/patch-3
1de4603 
add links to new C++ support docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghogen ghogen ghogen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@openpublishbuild @msftclas @ghogen @meganbradley