Joe Conley
c12a880a0c
Unshelved from pending changelist '4791207':
...
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5
#rb Ryan.Vance
[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -05:00
Ryan Vance
7c51ff94af
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
CL 1 of 8
#rb integration
[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
Ben Marsh
13d012685f
Merging copyright update from 4.19 branch.
...
#rb none
#rnx
#jira
[CL 3818977 by Ben Marsh in Staging-4.19 branch]
2018-01-02 15:30:26 -05:00
Ben Marsh
20bf0eb6a1
Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017).
...
#rb none
#lockdown Nick.Penwarden
[CL 3226823 by Ben Marsh in Main branch]
2016-12-08 08:52:44 -05:00
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
Jaroslaw Palczynski
b8c4d83b9c
Enabling UHT to digest GENERATED_BODY instead of GENERATED_*_BODY.
...
#codereview Robert.Manuszewski
[CL 2481360 by Jaroslaw Palczynski in Main branch]
2015-03-17 06:02:26 -04:00
Jaroslaw Palczynski
f23f29257b
Back out changelist 2481333
...
Rob asked me to back out GENERATED_*_BODY -> GENERATED_BODY change for now until the "_Validate and _Implementation auto-generation" discussion is over.
#codereview Robert.Manuszewski
[CL 2481343 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:38:32 -04:00
Jaroslaw Palczynski
fa31560e2d
Enabled UHT to digest GENERATED_BODY instead of GENERATED_UCLASS_BODY, GENERATED_USTRUCT_BODY, GENERATED_UINTERFACE_BODY or GENERATED_IINTERFACE_BODY, changed every occurence to the new syntax and fixed every warning that have fallen out of this change.
...
#codereview Robert.Manuszewski
[CL 2481333 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:19:11 -04: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
Ben Marsh
959cfa782d
Add missing copyright notices to source files.
...
[CL 2379212 by Ben Marsh in Main branch]
2014-12-06 19:14:20 -05:00
Tim Sweeney
324683ce78
Engine source (Main branch up to CL 2026164)
2014-03-14 14:13:41 -04:00
