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.

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
..
Editor	Merge branch 'main' into ly-as-sdk/LYN-2948	5 years ago
Plugins	Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948	5 years ago
CMakeLists.txt	Add newlines to the end of all files	5 years ago