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
8ba99b94dea0e126ab6da39a8428887ef22d14f5
UnrealEngineUWP/Engine/Source/Programs/AutomationTool
History
josh adams 8ba99b94de - Proper fix to merge conflicts 
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]
2019-02-16 07:13:44 -05:00
..
AllDesktop
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Android
Added support for using UE_SDK_ROOT (carefullyredist) in build scripts.
2019-01-30 12:32:58 -05:00
AutomationUtils
Fix target not being rebuilt when an plugin not required for this platform is disabled. Also add log output showing why a temp target was required.
2019-02-16 07:13:43 -05:00
BuildGraph
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-21 13:30:34 -05:00
Gauntlet
Made SaveRoleArtifacts virtual so it can be overridden
2019-02-05 18:31:48 -05:00
HTML5
HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade
2019-02-16 01:26:42 -05:00
IOS
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-25 23:58:19 -05:00
Linux
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
Localization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
Lumin
Parameters to LuminDeploy function changed with the integration, changing to match the new method signature.
2019-01-18 13:11:48 -05:00
Mac
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
OneSkyLocalization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
Properties
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Scripts
- Proper fix to merge conflicts
2019-02-16 07:13:44 -05:00
TVOS
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Win
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-02-06 13:27:58 -05:00
XLocLocalization
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-29 19:23:19 -05:00
app.config
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
app.manifest
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
AutomationTool_Mono.sln
Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4064755)
2018-05-10 14:17:01 -04:00
AutomationTool.csproj
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Program.cs
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00