From ce17273242d6864becde3c58fd0c75d1cc42fdb6 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 3 Apr 2004 20:45:48 +0000 Subject: [PATCH] resource-20040403 conflict resolution --- src/WINNT/client_exp/resource.h | 86 ++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/WINNT/client_exp/resource.h b/src/WINNT/client_exp/resource.h index 9ba7fb75f0..82c47be32b 100644 --- a/src/WINNT/client_exp/resource.h +++ b/src/WINNT/client_exp/resource.h @@ -126,49 +126,49 @@ #define IDS_CURRENT_DIRECTORY_PATH_TOO_LONG 134 #define IDS_CLEANACL_ERROR 135 -#define IDM_AUTHENTICATION 201 -#define IDM_ACL_SET 202 -#define IDM_VOLUME_PROPERTIES 203 -#define IDM_VOLUMEPARTITION_UPDATENAMEIDTABLE 204 -#define IDM_MOUNTPOINT_SHOW 205 -#define IDM_MOUNTPOINT_REMOVE 206 -#define IDM_MOUNTPOINT_MAKE 207 -#define IDM_FLUSH 208 -#define IDM_FLUSH_VOLUME 209 -#define IDM_SHOW_SERVER 210 -#define IDM_SHOWCELL 211 -#define IDM_SERVER_STATUS 212 -#define IDM_SYMBOLICLINK_REMOVE 213 -#define IDM_SYMBOLICLINK_ADD 214 -#define IDM_SUBMOUNTS 215 -#define IDM_ACL_CLEAN 216 -#define ID_GET_TOKENS 217 -#define ID_DISCARD_TOKENS 218 -#define IDM_SUBMOUNTS_EDIT 219 -#define IDD_KLOG_DIALOG 102 -#define IDR_MENU_FILE 129 -#define IDD_VOLUME_INFO 130 -#define IDD_SET_AFS_ACL 131 -#define IDD_DIALOG_TEST 132 -#define IDD_MAKE_MOUNT_POINT 133 -#define IDD_CLEAR_ACL 134 -#define IDD_SUBMTINFO 135 -#define IDD_ADD_ACL 136 -#define IDD_PARTITION_INFO 137 -#define IDD_COPY_ACL 138 -#define IDD_MENU_TEST_DLG 140 -#define IDD_WHICH_CELL 141 -#define IDD_WHERE_IS 142 -#define IDD_RESULTS 143 -#define IDD_MOUNT_POINTS 145 -#define IDD_DOWN_SERVERS 146 -#define IDD_SHOWSERVERS 147 -#define IDD_SERVERSTATUS 148 -#define IDD_AUTHENTICATION 149 -#define IDD_UNLOG_DIALOG 150 -#define IDD_ADD_SUBMOUNT 154 -#define IDD_SYMBOLICLINK_ADD 155 -#define IDM_REMOVE_SYMLINK 156 +#define IDM_AUTHENTICATION 901 +#define IDM_ACL_SET 902 +#define IDM_VOLUME_PROPERTIES 903 +#define IDM_VOLUMEPARTITION_UPDATENAMEIDTABLE 904 +#define IDM_MOUNTPOINT_SHOW 905 +#define IDM_MOUNTPOINT_REMOVE 906 +#define IDM_MOUNTPOINT_MAKE 907 +#define IDM_FLUSH 908 +#define IDM_FLUSH_VOLUME 909 +#define IDM_SHOW_SERVER 910 +#define IDM_SHOWCELL 911 +#define IDM_SERVER_STATUS 912 +#define IDM_SYMBOLICLINK_REMOVE 913 +#define IDM_SYMBOLICLINK_ADD 914 +#define IDM_SUBMOUNTS 915 +#define IDM_ACL_CLEAN 916 +#define ID_GET_TOKENS 917 +#define ID_DISCARD_TOKENS 918 +#define IDM_SUBMOUNTS_EDIT 919 +#define IDD_KLOG_DIALOG 920 +#define IDR_MENU_FILE 930 +#define IDD_VOLUME_INFO 931 +#define IDD_SET_AFS_ACL 932 +#define IDD_DIALOG_TEST 933 +#define IDD_MAKE_MOUNT_POINT 934 +#define IDD_CLEAR_ACL 935 +#define IDD_SUBMTINFO 936 +#define IDD_ADD_ACL 937 +#define IDD_PARTITION_INFO 938 +#define IDD_COPY_ACL 940 +#define IDD_MENU_TEST_DLG 941 +#define IDD_WHICH_CELL 942 +#define IDD_WHERE_IS 943 +#define IDD_RESULTS 945 +#define IDD_MOUNT_POINTS 946 +#define IDD_DOWN_SERVERS 947 +#define IDD_SHOWSERVERS 948 +#define IDD_SERVERSTATUS 949 +#define IDD_AUTHENTICATION 950 +#define IDD_UNLOG_DIALOG 954 +#define IDD_ADD_SUBMOUNT 955 +#define IDD_SYMBOLICLINK_ADD 956 +#define IDM_REMOVE_SYMLINK 957 #define IDC_LIST 1001 #define IDC_PASSWORD 1002 #define IDC_OFFLINE_MSG 1003