2 Commits

Author	SHA1	Message	Date
ben marsh	25b813086c	Fix manifest on Win32 referencing amd64 version of common controls assembly causing executables to fail to start. Not sure why this is a regression; manifest from 4.21 (//UE4/Release-4.21/Engine/Source/Runtime/Launch/Resources/Windows/PCLaunch-Win32.manifest) also references the incorrect platform. ... #rb none #jira UE-69583 #ROBOMERGE-SOURCE: CL 4905059 in //UE4/Release-4.22/... #ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main) [CL 4905063 by ben marsh in Main branch]	2019-02-05 16:08:07 -05:00
Ben Marsh	a22b952aa9	Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main) ... #rb none #rnx [CL 4718806 by Ben Marsh in Main branch]	2019-01-14 12:11:24 -05:00