diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:17 +0200 |
| commit | 5d178b6a1977988b5f331bcc1515c17982a3d116 (patch) | |
| tree | de9a36bd585d8c60132c881be18b0a3cc6611314 /dbaccess/inc | |
| parent | 3a2a53da020e66b9a9505b95bb0523d06ba7174e (diff) | |
| parent | 2f76d4b430490dcda4e041f15cda9cd2d89189d0 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
dbaccess/source/ui/app/makefile.mk
Diffstat (limited to 'dbaccess/inc')
| -rw-r--r-- | dbaccess/inc/dbaccess_helpid.hrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 29094bee1882..bb37eb5affff 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -436,6 +436,7 @@ #define HID_DSADMIN_IGNORECURRENCY "DBACCESS_HID_DSADMIN_IGNORECURRENCY" #define HID_MACRO_MIGRATION_BACKUP_LOCATION "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION" #define HID_DSADMIN_PRIMARY_KEY_SUPPORT "DBACCESS_HID_DSADMIN_PRIMARY_KEY_SUPPORT" +#define HID_DSADMIN_RESPECTRESULTSETTYPE "DBACCESS_HID_DSADMIN_RESPECTRESULTSETTYPE" // this one below have hid in number space HID_SBA_START #define HID_DLG_ADABAS_NEWDB "DBACCESS_HID_DLG_ADABAS_NEWDB" |