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.

Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712 ... Merged stabilization/2106 to development		4 years ago
..
Asset	Merged stabilization/2106 to development; Resolved merge conflicts	4 years ago
Bootstrap	Updated gem.json for all top-level Gems. (#1715) (#1917)	5 years ago
Component	Updated gem.json for all top-level Gems. (#1715) (#1917)	5 years ago
Feature	Merged stabilization/2106 to development; Resolved merge conflicts	4 years ago
RHI	Profiler: listen to OnSystemTick instead of OnFrameBegin (#1977)	4 years ago
RPI	Merged stabilization/2106 to development; Resolved merge conflicts	4 years ago
TestData	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Tools	Merged stabilization/2106 -> development (resolved merge conflicts).	5 years ago
Utils	Profiler: listen to OnSystemTick instead of OnFrameBegin (#1977)	4 years ago
CMakeLists.txt	Added detection of gems which are not directly under an external subdirectory root (#1841)	5 years ago
gem.json	Updated gem.json for all top-level Gems. (#1715) (#1917)	5 years ago