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

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
4 years ago
..
Animation auto-search/replace 4 years ago
Bus Gems/Gestures 4 years ago
IDraw2d.h Merge branch 'development' into cmake/SPEC-7179 4 years ago
ILyShine.h More string fixes 4 years ago
IRenderGraph.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ISprite.h auto-search/replace 4 years ago
UiAssetTypes.h Minimal TypeInfo header/reduce std interdependencies. (#2688) 4 years ago
UiBase.h removing files that got added by rebase 4 years ago
UiComponentTypes.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UiEntityContext.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UiLayoutCellBase.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UiSerializeHelpers.h removing files that got added by rebase 4 years ago