Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp

2021-08-25 11:47:19 -07:00

..

Containers

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 11:47:19 -07:00

Events

Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)

2021-08-17 06:52:20 -07:00

Export

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Utilities

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

DataObjectTests.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

TestsMain.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00