6 Commits

Author	SHA1	Message	Date
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 12:42:44 -05:00
Steve Pham	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
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	2021-06-28 19:09:20 -07:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
jonawals	abe35aad75	Add missing args to PythonBindingsExample.Tests	2021-05-19 13:45:26 +01:00
alexpete	a10351f38d	Initial commit	2021-03-08 14:30:57 -08:00