Restting new version info overwritten by merge

VCCE · Oct 30, 2020 · 1dc8cbf · 1dc8cbf
1 parent 7c5c8c4
commit 1dc8cbf
Show file tree

Hide file tree

Showing 2 changed files with 509 additions and 509 deletions.
diff --git a/Vcc.rc b/Vcc.rc
@@ -121,10 +121,10 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "About"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,181,363,50,14
-    LTEXT           "Copyright 2015 By",IDC_STATIC,19,132,61,8
-    LTEXT           "Joseph Forgione",IDC_STATIC,19,143,53,8
-    CONTROL         IDB_VCC,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,4,3,217,45
+DEFPUSHBUTTON   "OK",IDOK,181,363,50,14
+LTEXT           "Copyright 2015 By",IDC_STATIC,19,132,61,8
+LTEXT           "Joseph Forgione",IDC_STATIC,19,143,53,8
+CONTROL         IDB_VCC,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,4,3,217,45
     CONTROL         IDB_3GUYS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,12,53,77,57,WS_EX_DLGMODALFRAME
     LTEXT           "Another classic computer canceled before it's time!",IDC_STATIC,12,115,81,19
     LTEXT           "F11 = Fullscreen Toggle",IDC_STATIC,108,134,77,8
@@ -140,19 +140,19 @@ BEGIN
     CTEXT           "VCC (Virtual Color Computer) is free software: you can redistribute",IDC_STATIC,7,232,209,11
     CTEXT           "it and/or modify it under the terms of the GNU General Public License",IDC_STATIC,7,243,224,11
     CTEXT           "as published by the Free Software Foundation, either version 3 of the",IDC_STATIC,7,254,223,8
-    CTEXT           "License, or (at your option) any later version.",IDC_STATIC,37,265,159,8
-    CTEXT           "VCC (Virtual Color Computer) is distributed in the hope that it will ",IDC_STATIC,9,278,207,8
-    CTEXT           "be useful, but WITHOUT ANY WARRANTY; without even the implied warranty",IDC_STATIC,5,289,223,8
-    CTEXT           "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",IDC_STATIC,5,300,226,8
-    CTEXT           "See the GNU General Public License for more details.",IDC_STATIC,31,311,174,8
-    CTEXT           "You should have received a copy of the GNU General Public License",IDC_STATIC,5,326,219,8
-    CTEXT           "along with VCC (Virtual Color Computer). If not, see http://www.gnu.org/licenses/.",IDC_STATIC,31,337,174,18
-    CTEXT           "Rebased to more ""modern"" compilers by Gary Coulbourne",IDC_STATIC,1,182,230,8
-    CTEXT           "VCC Repository and Release Packages maintained by Bill Pierce",IDC_STATIC,9,173,206,8
-    CTEXT           "H6309 CPU fixes by Walter Zambotti",IDC_STATIC,54,212,122,12,SS_CENTERIMAGE
-    CTEXT           "Adapted to VS2015 and Minor Bug Fixes by Wes Gale",IDC_STATIC,23,183,178,10
-    CTEXT           "Bug fixes and Enhancements by Bill Pierce, Peter Westberg, && James Rye",IDC_STATIC,19,194,193,20
-END
+		CTEXT           "License, or (at your option) any later version.",IDC_STATIC,37,265,159,8
+		CTEXT           "VCC (Virtual Color Computer) is distributed in the hope that it will ",IDC_STATIC,9,278,207,8
+		CTEXT           "be useful, but WITHOUT ANY WARRANTY; without even the implied warranty",IDC_STATIC,5,289,223,8
+		CTEXT           "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",IDC_STATIC,5,300,226,8
+		CTEXT           "See the GNU General Public License for more details.",IDC_STATIC,31,311,174,8
+		CTEXT           "You should have received a copy of the GNU General Public License",IDC_STATIC,5,326,219,8
+		CTEXT           "along with VCC (Virtual Color Computer). If not, see http://www.gnu.org/licenses/.",IDC_STATIC,31,337,174,18
+		CTEXT           "Rebased to more ""modern"" compilers by Gary Coulbourne",IDC_STATIC,1,182,230,8
+		CTEXT           "VCC Repository and Release Packages maintained by Bill Pierce",IDC_STATIC,9,173,206,8
+		CTEXT           "H6309 CPU fixes by Walter Zambotti",IDC_STATIC,54,212,122,12,SS_CENTERIMAGE
+		CTEXT           "Adapted to VS2015 and Minor Bug Fixes by Wes Gale",IDC_STATIC,23,183,178,10
+		CTEXT           "Bug fixes and Enhancements by Bill Pierce, Peter Westberg, && James Rye",IDC_STATIC,19,194,193,20
+		END
 
 IDD_TCONFIG DIALOGEX 0, 0, 363, 213
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -180,9 +180,9 @@ BEGIN
     ICON            "",IDC_MONTYPE,84,14,21,20
     RADIOBUTTON     "RGB",IDC_RGB,9,15,31,10
     RADIOBUTTON     "Composite",IDC_COMPOSITE,9,28,49,10
-	RADIOBUTTON		 "Updated Palette", IDC_UPD_PALETTE, 19, 37, 70, 11
-	RADIOBUTTON		 "Original Palette", IDC_ORG_PALETTE, 19, 46, 70, 11
-END 
+    RADIOBUTTON     "Updated Palette",IDC_UPD_PALETTE,19,37,70,11
+    RADIOBUTTON     "Original Palette",IDC_ORG_PALETTE,19,46,70,11
+END
 
 IDD_CPU DIALOGEX 0, 0, 330, 167
 STYLE DS_SETFONT | WS_CHILD
@@ -516,7 +516,7 @@ BEGIN
         LEFTMARGIN, 1
         RIGHTMARGIN, 231
         TOPMARGIN, 3
-        BOTTOMMARGIN, 377
+        BOTTOMMARGIN, 337
     END
 
     IDD_TCONFIG, DIALOG
@@ -602,8 +602,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,6
- PRODUCTVERSION 2,0,1,6
+ FILEVERSION 2,1,0,2
+ PRODUCTVERSION 2,1,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -620,14 +620,14 @@ BEGIN
         BEGIN
             VALUE "Comments", "How bored are you that your reading this?"
             VALUE "CompanyName", "Not Radio Shack"
-            VALUE "FileDescription", "VCC"
-            VALUE "FileVersion", "2.1.0b"
+            VALUE "FileDescription", "Vcc"
+            VALUE "FileVersion", "2.0.1e"
             VALUE "InternalName", "Poco"
             VALUE "LegalCopyright", "Copyright � 2015 by BitRot Software"
             VALUE "LegalTrademarks", "BLAZEMONGER!"
             VALUE "OriginalFilename", "Vcc.exe"
             VALUE "PrivateBuild", "For a good time call 867-5309 Jenny ;)"
-            VALUE "ProductName", "VCC"
+            VALUE "ProductName", "Vcc"
             VALUE "ProductVersion", "26-3334"
             VALUE "SpecialBuild", "Tandy Color Computer 3"
         END