Jamie Dale 280aba69ce Fixing some localization key conflicts that crept in from stream merges ...

#rb none
#lockdown Nick.Penwarden

[CL 3239629 by Jamie Dale in Main branch]

2016-12-19 10:08:15 -05:00

..

Developer

Fix monolithic editor compile errors.

2016-12-19 08:35:11 -05:00

Editor

Fixing some localization key conflicts that crept in from stream merges

2016-12-19 10:08:15 -05:00

Programs

UBT: Do not forward the -2013/-2015/-2017 arguments to child instances of UBT created to rebuild UHT. Fixes locally compiling projects that force the compiler version to VS2013, which UHT does not support.

2016-12-18 16:42:40 -05:00

Runtime

Fix monolithic editor compile errors.

2016-12-19 08:35:11 -05:00

ThirdParty

Linux: fix compiling other architectures (UE-39685).

2016-12-16 18:53:13 -05:00

UE4Client.Target.cs

Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017).

2016-12-08 08:52:44 -05:00

UE4Editor.Target.cs

Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017).

2016-12-08 08:52:44 -05:00

UE4Game.Target.cs

Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3232619)

2016-12-13 11:58:16 -05:00

UE4Server.Target.cs

Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3232619)

2016-12-13 11:58:16 -05:00