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
..
Code	Merge branch 'development' into optimization/unused_files	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
gem.json	Templates restricted (#6498)	4 years ago
preview.png	Initial commit	5 years ago