birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream/development' into genewalt/gitflow_210628

Browse Source 
Signed-off-by: Gene Walters <genewalt@amazon.com>
This commit is contained in:
Gene Walters
2021-06-29 15:40:46 -07:00
parent f905b71844 9e85caa352
commit 6fb2558e44
39 changed files with 1034 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/Code/enabled_gems.cmake
+1
View File
@@ -48,6 +48,7 @@ set(ENABLED_GEMS
LyShine
HttpRequestor
Atom_AtomBridge
PythonCoverage
)
# TODO remove conditional add once AWSNativeSDK libs are fixed for Android and Linux Monolithic release.