Tommy Walton d614ff17d6 Merge commit '3d84876e87a3c28a420d74c19606d1fbe5c703d3' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:54:38 -08:00

..

AtomToolsFramework

Merge commit '3d84876e87a3c28a420d74c19606d1fbe5c703d3' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:54:38 -08:00

MaterialEditor

Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes

2021-11-11 21:48:47 -06:00

ShaderCanvas

Initial commit

2021-03-08 14:30:57 -08:00

ShaderManagementConsole

Update the FileIO Aliases (#4186)

2021-10-05 15:12:53 -05:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00