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.
o3de/Code
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
..
Editor Merge branch 'development' into optimization/unused_files 4 years ago
Framework Merge branch 'development' into optimization/unused_files 4 years ago
LauncherUnified [development] patch fix for launcher exit crash (#7050) 4 years ago
Legacy Merge branch 'development' into optimization/unused_files 4 years ago
Tools Merge branch 'development' into optimization/unused_files 4 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago