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 f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/CryEditDoc.cpp # Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp # Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp # Gems/PhysXDebug/Code/Source/SystemComponent.cpp		4 years ago
..
Objects	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
Tests	Merge branch 'development' into cmake/SPEC-7179	4 years ago
UI	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ComponentEntityEditorPlugin.cpp	Remove ResourceSelectorHost and clean up/refactor related bits (#3050)	4 years ago
ComponentEntityEditorPlugin.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ComponentEntityEditorPlugin.mf	git mv Code\Sandbox\Plugins Code/Editor/Plugins	5 years ago
SandboxIntegration.cpp	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
SandboxIntegration.h	Remove ResourceSelectorHost and clean up/refactor related bits (#3050)	4 years ago
componententityeditorplugin_files.cmake	Merge branch 'development' into cmake/SPEC-7179	4 years ago
componententityeditorplugin_test_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
dllmain.cpp	Merge branch 'development' into cmake/SPEC-7179	4 years ago