Commit Graph

7 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Marc Audy
e5bb9b4d0d Integrate all non-branch Engine/Source changes from //depot/UE4-Orion to //depot/UE4
#lockdown Ben.Marsh
#platformnotify Josh.Adams

[CL 2718236 by Marc Audy in Main branch]
2015-10-06 15:59:09 -04:00
Mieszko Zielinski
71fe69f03c Fixed FunctionalTesting framework not being able detect if the testing has already finished #UE4
[CL 2383371 by Mieszko Zielinski in Main branch]
2014-12-10 09:17:33 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Mieszko Zielinski
6726954152 Fixed FunctionalTestingManager not being removed from the rootset on world cleanup #UE4
Also FunctionalFramework's pch no longer including Engine.h

[CL 2116531 by Mieszko Zielinski in Main branch]
2014-06-25 05:47:19 -04:00
Bob Tellez
96c40b8974 Merging UE4-Fortnite -> Main using CL#2047477
[CL 2049479 by Bob Tellez in Main branch]
2014-04-23 19:29:53 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00