You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
2c763c1971
Unshelved from pending changelist '4792932': Source=CL 4784913 in //UE4/Main/... Acknowledger=joe.conley (Thu Jan 24 2019 17:07:18 GMT+0000 (Coordinated Universal Time)) ShelfCl=4792932 Target=Dev-VR Merge conflict: /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp - merging //UE4/Main/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp#7 /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln#2 Delete resolve: at: delete ay: ignore /src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.vcxproj.filters - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy... Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main) #rb none [CL 4800808 by Joe Conley in Dev-VR branch]
13 lines
649 B
Plaintext
13 lines
649 B
Plaintext
<?xml version="1.0" encoding="utf-8"?>
|
|
<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
<Name>libexpat</Name>
|
|
<Location>Engine\Source\ThirdParty\Python\</Location>
|
|
<Function>It is a part of Python source code and used by Python.</Function>
|
|
<Eula>https://sourceforge.net/p/expat/code_git/ci/master/tree/expat/COPYING</Eula>
|
|
<RedistributeTo>
|
|
<EndUserGroup>Licensees</EndUserGroup>
|
|
<EndUserGroup>Git</EndUserGroup>
|
|
<EndUserGroup>P4</EndUserGroup>
|
|
</RedistributeTo>
|
|
<LicenseFolder>>/Engine/Source/ThirdParty/Licenses/libexpat_License.txt</LicenseFolder>
|
|
</TpsData> |