Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. ...

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

2021-08-11 15:33:50 -05:00

..

Android

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

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

Common

Merge branch 'development' into cmake/SPEC-2513_w4018

2021-08-10 11:45:02 -07:00

iOS

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

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

Linux

Create XCB Connection mechanism for WSISurface implementation for Linux (#2400)

2021-07-26 13:41:28 -07:00

Mac

[Mac] Building and running game projects from an SDK (#2943)

2021-08-10 10:10:37 -05:00

Windows

Resolved conflicts in merge from stabilization/2106 -> development.

2021-08-11 15:33:50 -05:00