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/Legacy/CryCommon/Mocks
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
4 years ago
..
IAudioSystemMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ICVarMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
IConsoleMock.h runtime fixes (Editor running) 4 years ago
ICryPakMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ILogMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
IRemoteConsoleMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
IRendererMock.h Gems/Maestro 4 years ago
ISystemMock.h Merge branch 'development' into cmake/SPEC-7484 4 years ago
ITextureMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ITimerMock.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
StubTimer.h Merge branch 'development' into cmake/SPEC-7179 4 years ago