diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
| commit | 41bc9ff8d750b4af10d20a36539c57da14695dcf (patch) | |
| tree | dc2ee437c54daba12ac442fd0e10baf97eadf184 /dbaccess/source/ui/inc/dbu_resource.hrc | |
| parent | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (diff) | |
| parent | e35c56815d43a06c53488e3efa35f062a6a2d60c (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'dbaccess/source/ui/inc/dbu_resource.hrc')
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index c08d6597e829..7ba85bc6dfcb 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -118,7 +118,7 @@ #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 - +#define DLG_TABLE_FILTER RID_DIALOG_START + 32 //======================================================================== // tab pages |