Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -29,7 +29,7 @@
   </size>
  </property>
  <property name="windowTitle">
-   <string>About Lumberyard Editor</string>
+   <string>About Open 3D Engine Editor</string>
  </property>
  <property name="styleSheet">
   <string notr="true">background-color: transparent</string>
@@ -92,7 +92,7 @@
       <item>
        <widget class="QLabel" name="m_transparentVersion">
         <property name="text">
-          <string>Lumberyard Editor</string>
+          <string>Open 3D Engine Editor</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>