d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
6fb2558e44
Merge branch 'upstream/development' into genewalt/gitflow_210628
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 15:40:46 -07:00
0e0f266fdd
Provisional implementation of PythonCoverage gem
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:33 +01:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
Chris Galvan
Steve Pham
Gene Walters
John
alexpete