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
54,565 Commits 23 Branches 254 Tags
2a04c5bedbd97d3c975167534ec0069fd4bdab18
Commit Graph

3 Commits

Author SHA1 Message Date
Justin Marcus
75fc7317f3 Fix module name 
#jira UE-69927
#rb trivial

[CL 4972979 by Justin Marcus in Main branch]
 2019-02-12 12:05:41 -05:00
Justin Marcus
3421b059f4 Update coopyright notices 
#jira UE-69926
#rb trivial

[CL 4970841 by Justin Marcus in Main branch]
 2019-02-12 10:52:20 -05:00
justin marcus
8c97e3c469 #CodeReview: justin.marcus,jeff.williams 
Merge conflict.
justin.marcus, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp#3
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp#4
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h#3


--------------------------------------
Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)

Get Install Bundle Manager and dependcies building in main.



#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070

#rb none

[CL 4961624 by justin marcus in Main branch]
 2019-02-11 09:22:06 -05:00