Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-08-11 15:33:50 -05:00

..

build

Fix for PathLib unlink wrong version parameter. (#3020)

2021-08-10 18:43:44 -07:00

bundler

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

commit_validation

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

ctest

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00

detect_file_changes

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

license_scanner

Add script for license scanner (#2267)

2021-07-19 16:09:47 -07:00

migration

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

o3de

Added new feature to the register command to auto detect manifest file based on input path (#2967)

2021-08-09 16:58:19 -05:00

scrubbing

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

o3de.bat

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

o3de.py

Adding o3de.py subcommands for engine.json and gem.json modification (#2411)

2021-07-27 22:04:37 -05:00

o3de.sh

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00