Esteban Papp dd3f0b86e0 Merge branch 'development' into cmake/SPEC-7484 ...

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

# Conflicts:
#	Code/Editor/ToolBox.cpp

2021-08-02 18:45:25 -07:00

..

Tests

Code/Editor

2021-08-02 17:56:56 -07:00

EditorMetricsPlainTextNameRegistration.cpp

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

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

EditorMetricsPlainTextNameRegistration.h

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

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

LevelEditorMenuHandler.cpp

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

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

LevelEditorMenuHandler.h

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

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

QtEditorApplication_linux.cpp

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

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

QtEditorApplication_mac.mm

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

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

QtEditorApplication.cpp

Merge branch 'development' into cmake/SPEC-7484

2021-08-02 18:45:25 -07:00

QtEditorApplication.h

Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication

2021-07-19 13:32:09 -05:00