richard malo d978c401a8 Back out changelist 6930726 ...

#rnx


#ROBOMERGE-SOURCE: CL 6942002 via CL 6944536
#ROBOMERGE-BOT: (v366-6836689)

[CL 6946900 by richard malo in Main branch]

2019-06-11 23:18:38 -04:00

..

Android

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

2019-05-25 03:15:46 -04:00

HoloLens

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

2019-06-10 12:22:13 -04:00

HTML5

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

2019-06-05 11:49:03 -04:00

IOS

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

2019-05-25 03:15:46 -04:00

Linux

#ocn - Enable CrashReporter plugin by default on iOS

2019-06-06 19:23:55 -04:00

Localization

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

2019-02-16 00:04:01 -05:00

Lumin

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

2019-05-25 03:15:46 -04:00

Mac

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

2019-05-25 03:15:46 -04:00

TVOS

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

2019-05-25 03:15:46 -04:00

Unix

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

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

Windows

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

2019-05-25 03:15:46 -04: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-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469

2019-06-11 18:27:07 -04:00

BaseEditor.ini

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

2019-04-04 02:48:32 -04:00

BaseEditorKeyBindings.ini

…

BaseEditorLayout.ini

…

BaseEditorPerProjectUserSettings.ini

Removing unused editor utility UI

2019-06-10 18:07:11 -04:00

BaseEditorSettings.ini

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

2019-06-05 11:49:03 -04:00

BaseEngine.ini

Back out changelist 6930726

2019-06-11 23:18:38 -04:00

BaseGame.ini

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

2019-05-25 03:15:46 -04: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-Mobile (//UE4/Dev-Mobile)

2018-11-13 23:40:18 -05:00

BaseInput.ini

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

2019-06-05 11:49:03 -04: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/Main/Engine/... to //UE4/Dev-Mobile

2019-01-17 21:54:28 -05:00

BaseScalability.ini

Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469

2019-06-11 18:27:07 -04:00

ConsoleVariables.ini

Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469

2019-06-11 18:27:07 -04:00