Merge branch 'master' of tpgithost:Echo/InterlockingTool

@@ -65,7 +65,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\SN Writer.ico"
+IDR_MAINFRAME           ICON    DISCARDABLE     "res\\idr_main.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -273,7 +273,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
     WS_SYSMENU
 EXSTYLE WS_EX_CLIENTEDGE | WS_EX_APPWINDOW
 CAPTION "c"
-FONT 9, "΢ÈíÑźÚ"
+FONT 9, "΢ÈíÑźÚ", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Save",IDC_BT_SAVE_SWVER,246,10,44,15

@@ -29,7 +29,7 @@ static char THIS_FILE[] = __FILE__;
 unsigned short g_iTotalComPort = MAX_COMPORT_COUNT;
 unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0};
 
-const char *g_strToolVersion = "SN Writer V1.1728.00";
+const char *g_strToolVersion = "check flag tool";
 
 extern CSNWriterDlg *g_pMainDlg;
 

@@ -242,7 +242,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        158
+#define _APS_NEXT_RESOURCE_VALUE        159
 #define _APS_NEXT_COMMAND_VALUE         32798
 #define _APS_NEXT_CONTROL_VALUE         1177
 #define _APS_NEXT_SYMED_VALUE           101