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 f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
5 years ago
..
AzCore Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
Platform Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms (#821) 5 years ago
Tests Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
CMakeLists.txt 3rd Party static libraries need to be public dependencies to work from installed engine. 5 years ago