chris gagnon 435467dd55 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) ...

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4837013 by chris gagnon in Dev-Networking branch]

2019-01-29 19:24:53 -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

Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680

2019-01-24 20:39:08 -05:00

Linux

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

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

Localization

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

2019-01-29 19:24:53 -05: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

Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152

2019-01-28 16:32:53 -05:00

BaseEditor.ini

Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024

2019-01-29 04:28:43 -05:00

BaseEditorKeyBindings.ini

…

BaseEditorLayout.ini

…

BaseEditorPerProjectUserSettings.ini

Resolving conflict.

2019-01-23 16:05:15 -05:00

BaseEditorSettings.ini

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

BaseEngine.ini

Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024

2019-01-29 04:28:43 -05:00

BaseGame.ini

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

2019-01-14 12:15:37 -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/Dev-Sequencer [at] 4773300 to Dev-Main (//UE4/Dev-Main)

2019-01-23 09:49:24 -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