Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused ...

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

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp

2021-08-25 14:50:05 -07:00

..

Editor

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 14:50:05 -07:00

Framework

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 14:50:05 -07:00

LauncherUnified

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 11:47:19 -07:00

Legacy

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 14:50:05 -07:00

Tools

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 11:47:19 -07:00

CMakeLists.txt

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

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