Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-16 11:45:09 -08:00
parent e44fa2a52a b0dfe26232
commit 0dcf49affc
50 changed files with 19 additions and 19 deletions
@@ -60,7 +60,7 @@ namespace AZ
            }
        }

-        AZStd::sys_time_t ShaderVariantAsset::GetBuildTimestamp() const
+        AZ::u64 ShaderVariantAsset::GetBuildTimestamp() const
        {
            return m_buildTimestamp;
        }