izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
fac0b05ba77d025c40134b02027247bec0f4cf18
UnrealEngineUWP/Engine/Source/Runtime/Core/Public/Serialization
History
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
..
Csv
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Formatters
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
Archive.h
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
ArchiveFromStructuredArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ArchiveLoadCompressedProxy.h
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
ArchiveProxy.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ArchiveSaveCompressedProxy.h
Unshelved from pending changelist '4791207':
2019-01-23 19:56:41 -05:00
ArchiveSerializedPropertyChain.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ArrayReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
ArrayWriter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BitArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BitReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BitWriter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BufferArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BufferReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
BufferWriter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CompressedChunkInfo.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
CustomVersion.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
LargeMemoryData.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
LargeMemoryReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
LargeMemoryWriter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MemoryArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MemoryReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
MemoryWriter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
NameAsStringProxyArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
StaticMemoryReader.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
StructuredArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
StructuredArchiveFormatter.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00
StructuredArchiveFromArchive.h
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
2019-01-17 18:54:05 -05:00