James Hopkin 03fa8c7775 Manual merge changelist that broke RoboMerge, due to weird integration records for test files ...

Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main) CL - 4860397
#rb none

[CL 4883189 by James Hopkin in Dev-Networking branch]

2019-02-04 09:35:31 -05:00

..

Blueprint

Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)

2019-01-23 09:49:18 -05:00

Internationalization

Fix copyright notices from Dev-Editor merge causing warnings in CIS.

2019-01-03 09:40:02 -05:00

Misc

Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)

2019-01-23 09:49:18 -05:00

Serialization

[Gil.Gribb and maybe others did most of the work, I just did the IOS parts, but I am checking it in, since IOS was the last stop on the code train]

2019-01-30 13:46:29 -05:00

Templates

Manual merge changelist that broke RoboMerge, due to weird integration records for test files

2019-02-04 09:35:31 -05:00

UObject

Fix merge conflicts.

2019-01-31 15:36:12 -05:00

CoreUObject.h

Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)

2019-01-23 09:49:18 -05:00

CoreUObjectSharedPCH.h

Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)

2019-01-23 09:49:18 -05:00