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.

Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development. ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
Bootstrapper.wxs	[development] installer work - added 'files in use' page and fixed toolset path propagation (#2855)	5 years ago
BootstrapperTheme.wxl.in	[development] installer work - added 'files in use' page and fixed toolset path propagation (#2855)	5 years ago
BootstrapperTheme.xml.in	Resolved conflicts in merge from stabilization/2106 -> development.	5 years ago
PostInstallSetup.wxs	[cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...)	5 years ago
Shortcuts.wxs	[installer/2106-desktop-shortcuts] update desktop shortcuts created by the installer	5 years ago
Template.wxs.in	[cpack/2106-compression] enable higher compression of installer artifacts	5 years ago
product_icon.ico	[cpack_installer] updated installer icon/logo	5 years ago
product_logo.png	[cpack/stabilization/2106] bootrapper banner updates - replaced logo and removed text	5 years ago
warning.png	[cpack/stabilization/2106] updated failure state page layout to include warning image	5 years ago