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
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
588127772c
Fixing missing preview in texture settings
2021-06-14 12:40:19 -07:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Galvan
Steve Pham
Gene Walters
mnaumov
Chris Burel
alexpete