bob tellez b2b36b0fa0 Merging CL#7257773 ...

Back out changelist 7256178. This was a bad merge


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7258012 via CL 7266926 via CL 7266952
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7339329 by bob tellez in Dev-Build branch]

2019-07-16 23:57:23 -04:00

..

Android

- Fixed bad Android icon reference

2019-05-21 16:13:27 -04:00

HoloLens

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

2019-06-10 19:47:29 -04:00

HTML5

Turn on AudioMixerSDL by default for HTML5. #fyi aaron.mcleran #jira none

2019-06-03 22:50:56 -04:00

IOS

- Converted FPlatformInfo table to DataDrivenPlatformInfo.ini sections

2019-05-07 17:37:59 -04:00

Linux

Remove the blanket agreement to upload crashes on Linux

2019-07-16 23:17:56 -04:00

Localization

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

2019-02-20 15:06:37 -05:00

Lumin

- Converted FPlatformInfo table to DataDrivenPlatformInfo.ini sections

2019-05-07 17:37:59 -04:00

Mac

- Converted FPlatformInfo table to DataDrivenPlatformInfo.ini sections

2019-05-07 17:37:59 -04:00

TVOS

- Converted FPlatformInfo table to DataDrivenPlatformInfo.ini sections

2019-05-07 17:37:59 -04:00

Unix

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

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

Windows

- Converted FPlatformInfo table to DataDrivenPlatformInfo.ini sections

2019-05-07 17:37:59 -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

Remove legacy r.EarlyZPassMovable from iOS device profiles

2019-07-16 23:26:58 -04:00

BaseEditor.ini

added key information to the DiffAssetRegistriesCommandlet csv file so it's easier to use.

2019-03-27 01:31:30 -04:00

BaseEditorKeyBindings.ini

…

BaseEditorLayout.ini

…

BaseEditorPerProjectUserSettings.ini

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

2019-06-10 19:47:29 -04:00

BaseEditorSettings.ini

Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861

2019-06-07 05:27:42 -04:00

BaseEngine.ini

Merging CL#7257773

2019-07-16 23:57:23 -04:00

BaseGame.ini

Fix early pak downloader not including global shader archive when using shared cooks.

2019-05-07 17:06:14 -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

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

2018-09-25 10:11:35 -04:00

BaseInput.ini

Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 6835245

2019-06-07 05:00:15 -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

Merge from //UE4/Main.

2019-01-10 11:10:29 -05:00

BaseScalability.ini

Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469

2019-06-19 08:52:32 -04:00

ConsoleVariables.ini

Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469

2019-06-19 08:52:32 -04:00