Merge commit 'e8576acbb0510717d57f168096a9cc6ad0c2fbf9' into puvvadar/gitflow_211118_o3de
This commit is contained in:
@@ -3833,7 +3833,7 @@ void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr,
|
||||
{
|
||||
if (sTitleStr.isEmpty())
|
||||
{
|
||||
sTitleStr = QObject::tr("O3DE Editor [Developer Preview]");
|
||||
sTitleStr = QObject::tr("O3DE Editor [Stable 21.11]");
|
||||
}
|
||||
|
||||
if (!sPreTitleStr.isEmpty())
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
|
||||
|
||||
<Bundle Name="$(var.CPACK_PACKAGE_NAME) [Developer Preview]"
|
||||
<Bundle Name="$(var.CPACK_PACKAGE_NAME) [Stable 21.11]"
|
||||
Version="$(var.CPACK_PACKAGE_VERSION)"
|
||||
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
|
||||
UpgradeCode="$(var.CPACK_BOOTSTRAP_UPGRADE_GUID)"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<DirectoryRef Id="TARGETDIR">
|
||||
<Directory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_NAME) [Developer Preview]">
|
||||
<Directory Id="ApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_NAME) [Stable 21.11]">
|
||||
<Directory Id="VersionedApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_VERSION)"/>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
Reference in New Issue
Block a user