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/Framework/AzToolsFramework/AzToolsFramework/Application
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
4 years ago
..
EditorEntityManager.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
EditorEntityManager.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Ticker.cpp Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Ticker.h Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
ToolsApplication.cpp Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
ToolsApplication.h Code/Framework compiling 5 years ago