Commit Graph

5 Commits

Author SHA1 Message Date
Robert Manuszewski
2752c82adc Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -05:00
Robert Manuszewski
8841a31595 Merging //UE4/Dev-Main @ 4448303 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4450493 by Robert Manuszewski in Dev-Core branch]
2018-10-11 08:14:26 -04:00
chris babcock
ececa2cb54 Fix ConfigRules.jar parsing for Linux line endings
#jira UE
#ue4
#android
[FYI] Jack.Porter
#rb ryan.king

#ROBOMERGE-SOURCE: CL 4433328 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4433330 by chris babcock in Staging-4.21 branch]
2018-10-05 15:55:20 -04:00
Robert Manuszewski
02ba9f72df Merging //UE4/Dev-Main @ 4397329 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4397828 by Robert Manuszewski in Dev-Core branch]
2018-09-26 08:22:54 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00