Merge branch 'master' into roller/chromium/master

This commit is contained in:
John Kleinschmidt 2021-03-15 18:43:25 -04:00
parent 8f4e362d8f
commit 57a8781c01
137 changed files with 876 additions and 4289 deletions

View file

@ -50,8 +50,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 14,0,0,20210304
PRODUCTVERSION 14,0,0,20210304
FILEVERSION 14,0,0,20210315
PRODUCTVERSION 14,0,0,20210315
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L