Logo
Explore Help
Sign In
izzy/UnrealEngineUWP
0
0
Fork 0
You've already forked UnrealEngineUWP
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
c8fe08076ce8f656b79dfffe2b66dd9cbdf499ac
UnrealEngineUWP/Engine/Source/Programs/nDisplayLauncher/Cluster/Config/Entity/EntityBase.cs

15 lines
280 B
C#
Raw Normal View History

Resolving conflict from Dev-Enterprise. /src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20 -------------------------------------- Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main) #rb none #lockdown Nick.Penwarden #ROBOMERGE-OWNER: ryan.gerleve #ROBOMERGE-AUTHOR: francis.hurteau #ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/... #ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking) [CL 4712032 by ryan gerleve in Dev-Networking branch]
2019-01-11 14:26:15 -05:00
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
using System;
using System.Collections.Generic;
using System.Linq;
namespace nDisplayLauncher.Cluster.Config.Entity
{
public abstract class EntityBase
{
public abstract void InitializeFromText(string text);
}
}
Reference in New Issue Copy Permalink
Powered by Gitea Page: 220ms Template: 11ms
English
English
Licenses API