Chris Galvan 4b672a0a32 Fixed merge conflict. ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-08-25 16:13:22 -05:00

..

Editor

Fixed merge conflict.

2021-08-25 16:13:22 -05:00

Framework

Legacy cleanup (#3383)

2021-08-25 15:04:38 -06:00

LauncherUnified

Adds functions so targets can define install directories/files

2021-08-24 15:12:02 -07:00

Legacy

Fixed merge conflict.

2021-08-25 16:13:22 -05:00

Tools

Merge pull request #3394 from aws-lumberyard-dev/Budgets

2021-08-25 09:03:25 -06:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00