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/scripts/build/Platform
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
5 years ago
..
Android Update minimum required CMake version to 3.20 (#1253) 5 years ago
Linux Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 5 years ago
Mac Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15 5 years ago
Windows Merge branch 'development' into TIF/Runtime 5 years ago
iOS Changed mac and ios node label 5 years ago