Commit Graph

6 Commits

Author SHA1 Message Date
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
chris babcock
b330185699 Small update to configrules tool
#jira UE-80738
#ue4
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 9480068 via CL 9480073
#ROBOMERGE-BOT: (v508-9471939)

[CL 9480074 by chris babcock in Main branch]
2019-10-08 15:42:55 -04:00
chris babcock
98a8642393 Fix for issue when configrules.txt less than 80 bytes (contributed by scahp)
#jira UE-80738
#PR #6237
#ue4
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 9479867 via CL 9479874
#ROBOMERGE-BOT: (v508-9471939)

[CL 9479875 by chris babcock in Main branch]
2019-10-08 15:33:23 -04:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05: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
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