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/Framework/AzCore
pappeste 6ab9d68e69 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Code/Tools/ProjectManager/CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog.cpp
#	Code/Tools/ProjectManager/Source/GemCatalog.h
#	Code/Tools/ProjectManager/Source/GemCatalog.ui
#	Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h
#	Code/Tools/ProjectManager/Source/ScreenFactory.cpp
#	Code/Tools/ProjectManager/project_manager_files.cmake
#	Code/Tools/ProjectManager/source/Qt/GemCatalog.h
5 years ago
..
AzCore Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
Platform LYN-2723: Fixes issues with bad project or engine paths (#369) 5 years ago
Tests {LYN-2257} Helios - Add Matrix math type for JSON Serialization system (#561) 5 years ago
.p4ignore Initial commit 5 years ago
CMakeLists.txt 3rd Party static libraries need to be public dependencies to work from installed engine. 5 years ago