birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6b96be82ea'
${ noResults }
o3de/Code/Tools
History
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
 		4 years ago
..
AWSNativeSDKInit Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Android/ProjectBuilder Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
AssetBundler Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
AssetProcessor Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
AzTestRunner Merge pull request #1997 from aws-lumberyard-dev/aztestrunner_retry_command 4 years ago
CrashHandler small fix, everything compiling with VS2022 4 years ago
DeltaCataloger Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
GridHub @lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h 4 years ago
ProjectManager Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
PythonBindingsExample Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
RemoteConsole Adds a verification response for the remote console connecting 4 years ago
SceneAPI Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
SerializeContextTools Windows and Linux compiling 4 years ago
Standalone Merge branch 'development' into cmake/linux_fix_warn_unused 4 years ago
TestImpactFramework more fixes 4 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago