James Hopkin 235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) ...

Copying to Dev-Main @ CL# 4688301

#rb none

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

2019-01-11 02:57:03 -05:00

..

Android

Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-11-16 14:01:06 -05:00

HTML5

Copying //UE4/Dev-Mobile to //UE4/Dev-Main (Source: //UE4/Dev-Mobile @ 4047413)

2018-05-02 22:53:38 -04:00

IOS

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

2018-10-29 10:01:28 -04:00

Linux

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

2018-10-29 10:01:28 -04:00

Localization

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

2018-06-07 22:39:07 -04:00

Lumin

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

2018-09-04 14:32:41 -04:00

Mac

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

2018-10-29 10:01:28 -04:00

TVOS

Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)

2019-01-02 15:37:07 -05:00

Unix

Copying Quail@3980758 to Dev-Main (//UE4/Dev-Main)

2018-04-03 15:23:51 -04:00

Windows

Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-11-16 14:01:06 -05:00

Base.ini

- Adding some text to Base.ini so that it doesn't cause problems by being empty and then getting skipped, etc. [user reported]

2015-05-04 19:29:18 -04:00

BaseCompat.ini

…

BaseDeviceProfiles.ini

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

2019-01-11 02:57:03 -05:00

BaseEditor.ini

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

2018-10-29 10:01:28 -04:00

BaseEditorKeyBindings.ini

…

BaseEditorLayout.ini

…

BaseEditorPerProjectUserSettings.ini

Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)

2019-01-02 15:37:07 -05:00

BaseEditorSettings.ini

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

2018-08-14 15:58:25 -04:00

BaseEngine.ini

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

2019-01-11 02:57:03 -05:00

BaseGame.ini

Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-11-16 14:01:06 -05:00

BaseGameUserSettings.ini

Copying //UE4/Dev-Editor to //UE4/Dev-Main (Source: //UE4/Dev-Editor @ 3739701)

2017-11-06 18:22:01 -05:00

BaseHardware.ini

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

2018-10-29 10:01:28 -04:00

BaseInput.ini

Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-11-16 14:01:06 -05:00

BaseLightmass.ini

Copying //UE4/Dev-Rendering to //UE4/Dev-Main (Source: //UE4/Dev-Rendering @ 3809756)

2017-12-15 12:47:47 -05:00

BasePakFileRules.ini

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

2019-01-11 02:57:03 -05:00

BaseScalability.ini

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

2018-10-29 10:01:28 -04:00

ConsoleVariables.ini

Merging conflict by hand.

2018-12-12 11:43:42 -05:00