merge from dev2

QuakeGod

2022-07-22 dd67df95a7303aee3bed65ffa935465f20ee8b32

 MTerm2/resource.h

@@ -225,12 +225,21 @@
#define IDC_EDIT8                       1060

#define IDC_EDIT32                      1060

#define IDC_COMBO2                      1061

#define IDC_EDIT_INPUT                  1061

#define IDC_COMBO3                      1062

#define IDC_BUTTON5                     1062

#define IDC_RADIO1                      1063

#define IDC_BUTTON_CLEAR                1063

#define IDC_RADIO2                      1064

#define IDC_BUTTON_ADD                  1064

#define IDC_RADIO3                      1065

#define IDC_EDIT_VIEW                   1065

#define IDC_STATIC_PROP                 1066

#define IDC_BUTTON_BACKSPACE            1066

#define IDC_SCROLLBAR1                  1067

#define IDC_BUTTON_0                    1067

#define IDC_BUTTON_EQ                   1068

#define IDC_BUTTON1_DOT                 1069

#define IDC_EDIT_DAY                    1070

#define IDC_RADIO4                      1070

#define IDC_EDIT_HOUR                   1071

@@ -533,6 +542,9 @@
#define ID_BUTTON_9                     33084

#define ID_BUTTON33085                  33085

#define ID_BUTTON33086                  33086

#define ID_33088                        33088

#define ID_MENU_SHOW_DEV                33089

#define IDS_STRING101                   33101

#define ID_INDICATOR_SEL_TYPE           59135

#define ID_INDICATOR_MACHINE_TYPE       59142

#define ID_INDICATOR_PROGRAM_POS        59143

@@ -547,8 +559,8 @@
#ifdef APSTUDIO_INVOKED

#ifndef APSTUDIO_READONLY_SYMBOLS

#define _APS_NEXT_RESOURCE_VALUE        356

#define _APS_NEXT_COMMAND_VALUE         33087

#define _APS_NEXT_CONTROL_VALUE         1061

#define _APS_NEXT_COMMAND_VALUE         33091

#define _APS_NEXT_CONTROL_VALUE         1070

#define _APS_NEXT_SYMED_VALUE           319

#endif

#endif