Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244 ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp

2021-08-18 12:39:24 -07:00

..

Editor

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

2021-08-18 12:39:24 -07:00

Framework

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

2021-08-18 12:39:24 -07:00

LauncherUnified

LauncherUnified

2021-08-16 16:05:23 -07:00

Legacy

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

2021-08-18 12:39:24 -07:00

Tools

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

2021-08-18 12:39:24 -07:00

CMakeLists.txt

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

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