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.
o3de/Code/Editor/Plugins/ComponentEntityEditorPlugin
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
4 years ago
..
Objects Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
Tests Merge branch 'development' into cmake/SPEC-7179 4 years ago
UI Code/Editor 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 Code/Editor 4 years ago
SandboxIntegration.h Code/Editor 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