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 '0c6a838c6f'
${ noResults }
o3de/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles
History
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
 		4 years ago
..
CommonTypes.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CommonTypes.h Atom 4 years ago
GlobalBuildOptions.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
GlobalBuildOptions.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Preprocessor.cpp [ATOM-13679] ShaderAssetBuilder: Create UnitTest To Validate (#3096) 4 years ago
Preprocessor.h [ATOM-13679] ShaderAssetBuilder: Create UnitTest To Validate (#3096) 4 years ago