You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Framework/AzCore/AzCore/azcore_files.cmake # Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif		4 years ago
..
Controller.cpp	Merge branch 'development' into redcode/driller_removal	4 years ago
Controller.h	Merging from development	4 years ago
FileSaver.cpp	Merge branch 'development' into redcode/driller_removal	4 years ago
FileSaver.h	Merging from development	4 years ago
LogTraits.h	dependency sort finished, but not tested	4 years ago
Model.cpp	Merging from development	4 years ago
Model.h	Renamed controller.ui --> view.ui, minor tweaks in response to PR	4 years ago
ModelTraits.h	Merging from development	4 years ago
Modifier.cpp	Merging from development	4 years ago
Modifier.h	Merging from development	4 years ago
Scanner.cpp	Merging from development	4 years ago
Scanner.h	Merging from development	4 years ago
UpgradeHelper.cpp	Merging from development	4 years ago
UpgradeHelper.h	Merging from development	4 years ago
UpgradeHelper.ui	Split StyleHelper.h into a header and source file (#4614)	4 years ago
VersionExplorerLog.cpp	Renamed controller.ui --> view.ui, minor tweaks in response to PR	4 years ago
VersionExplorerLog.h	Modifier step WIP	4 years ago
View.ui	Renamed controller.ui --> view.ui, minor tweaks in response to PR	4 years ago