6 Commits (b07ed7817dd280a0710ad2450f488024f1824baa)

Author	SHA1	Message	Date
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	5 years ago
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>	5 years ago
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	5 years ago
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	5 years ago
jonawals	abe35aad75	Add missing args to PythonBindingsExample.Tests	5 years ago
alexpete	a10351f38d	Initial commit	5 years ago