You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp 6fad254b59 Merge branch 'development' into optimization/unused_files ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/IEditorImpl.cpp # Code/Editor/IEditorImpl.h # Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake		4 years ago
..
AzToolsFramework	Merge branch 'development' into optimization/unused_files	4 years ago
Platform	GCC Support for Linux	4 years ago
Tests	The default android platform settings refer to lumberyard #3881 (#7073)	4 years ago
CMakeLists.txt	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago