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
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
..
AtomCore Add newlines to the end of all files 5 years ago
AzAndroid/java/com/amazon Add newlines to the end of all files 5 years ago
AzAutoGen Add newlines to the end of all files 5 years ago
AzCore Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
AzFramework Moving SystemUtilsApple.mm and SystemUtilsApple.h from CrySystem to AzFramework to fix linker error when building iOS non-monolithically (#631) 5 years ago
AzGameFramework Add newlines to the end of all files 5 years ago
AzManipulatorTestFramework remove unneeded temporary 5 years ago
AzNetworking Add newlines to the end of all files 5 years ago
AzQtComponents Deleted AzFramework::AtomActiveInterface 5 years ago
AzTest Add newlines to the end of all files 5 years ago
AzToolsFramework Restore grid and angle snapping (#640) 5 years ago
Crcfix Add newlines to the end of all files 5 years ago
GFxFramework Add newlines to the end of all files 5 years ago
GridMate Add newlines to the end of all files 5 years ago
Tests Revamped AzFramework::Scene (#332) 5 years ago
CMakeLists.txt Add newlines to the end of all files 5 years ago