izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
7d2361bd3196e49008909b675886f7819d75245f
UnrealEngineUWP/Engine/Source/Programs
History
daniel lamb 7d2361bd31 [CODEREVIEW] daniel.lamb,jeff.williams 
Merge conflict.
daniel.lamb, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs - merging //Fortnite/Dev-EngineMerge/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs#2


--------------------------------------
Create labels for content builds.
#rb William.Ewen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4869450 via CL 4873808 via CL 4877426
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4884685 by daniel lamb in Dev-Networking branch]
2019-02-04 12:39:27 -05:00
..
AutomationTool
Gauntlet -
2019-02-04 12:33:22 -05:00
AutomationToolLauncher
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
BlankProgram
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
BreakpadSymbolEncoder
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
BuildPatchTool
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
CrashReportClient
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
DotNETCommon
Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
2019-01-28 16:32:53 -05:00
GitDependencies
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
HTML5/HTML5LaunchHelper
Update default copyright notices for C# projects.
2018-12-18 14:08:17 -05:00
ImageValidator
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
IncludeTool
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
IOS
UE-69055 - //UE4/Main - Build Tools CS - Processor architecture mismatch between project "MSIL" and "AMD64"
2019-01-28 05:56:26 -05:00
Mac
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
MayaLiveLinkPlugin
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
MemoryProfiler2
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
MinidumpDiagnostics
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
nDisplayLauncher
Resolving conflict.
2019-01-23 16:05:15 -05:00
nDisplayListener
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
NetworkProfiler
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
PixelStreaming
Resolving conflict.
2019-01-23 16:05:15 -05:00
ReplayServer
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
RPCUtility
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ShaderCompileWorker
Fix merge conflict
2019-01-31 12:42:57 -05:00
SlateViewer
Programs need to build with support for developer tools in order to get all SlateEditorStyle code..
2019-01-17 10:52:45 -05:00
SymbolDebugger
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
TestPAL
Removing reference to hardcoded Steam path from dll loading test in pal app.
2019-02-01 22:08:41 -05:00
UnrealBuildTool
[CODEREVIEW] daniel.lamb,jeff.williams
2019-02-04 12:39:27 -05:00
UnrealCEFSubProcess
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
UnrealControls
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
UnrealFileServer
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealFrontend
Fix broken icons in UnrealFrontend.
2019-01-30 02:10:27 -05:00
UnrealGameSync
Copy UGS from Dev-Build (pt 2)
2019-01-16 13:39:33 -05:00
UnrealHeaderTool
Refactored structs to reduce executable space from UHT-generated code tables.
2019-01-24 15:50:36 -05:00
UnrealHitchParser
Updated CheckCopyrightNotices script to detect more missing files.
2018-12-18 14:42:56 -05:00
UnrealLightmass
Fix merge conflict
2019-01-31 12:42:57 -05:00
UnrealMultiUserServer
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealPak
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
UnrealSwarm
Fix merge conflict
2019-01-31 12:42:57 -05:00
UnrealVersionSelector
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:24:53 -05:00
UnrealVS
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
UnrealWatchdog
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Windows/BootstrapPackagedGame
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00