birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c85e5a6886'
${ noResults }
o3de/Code/Framework/AzFramework
History
Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
 		5 years ago
..
AzFramework Merge branch 'development' into cmake/SPEC-7484 5 years ago
Platform Merge branch 'development' into cmake/SPEC-7484 5 years ago
Tests Merge branch 'development' into cmake/SPEC-2513_w4267 5 years ago
CMakeLists.txt Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361) 5 years ago