modified: gpg_wrapper.cpp

	modified:   log.cpp
	modified:   log.h
	modified:   main.cpp
	modified:   new_gpg.rc
	modified:   options.cpp
	modified:   resource.h

1 files changed, 4 insertions, 1 deletions

diff --git a/resource.h b/resource.h
index ce35553..9aac61f 100644
--- a/resource.h
+++ b/resource.h
@@ -13,6 +13,7 @@
 #define IDD_LOAD_EXISTING_KEY           110

 #define IDD_KEY_PASSWD                  111

 #define IDI_SECURED                     112

+#define IDD_IMPORT_KEY                  112

 #define IDI_UNSECURED                   113

 #define IDC_SET_BIN_PATH                1016

 #define IDC_SET_HOME_DIR                1017

@@ -55,6 +56,7 @@
 #define IDC_BUTTON2                     1046

 #define IDC_OTHER                       1046

 #define IDC_LOG_FILE_SET                1046

+#define IDC_IMPORT                      1046

 #define IDC_SAVE_PASSWORD               1047

 #define IDC_DEBUG_LOG                   1048

 #define IDC_JABBER_API                  1049

@@ -64,6 +66,7 @@
 #define IDC_KEYID                       1053

 #define IDC_CURRENT_KEY                 1054

 #define IDC_DEFAULT_PASSWORD            1055

+#define IDC_LEYSERVER                   1058

 

 // Next default values for new objects

 // 

@@ -71,7 +74,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        114

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1056

+#define _APS_NEXT_CONTROL_VALUE         1061

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif