diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-24 15:03:19 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-24 15:03:19 +0200 |
| commit | 994ce8b6670f61c070bbaf3aa4e7128d3c7ca229 (patch) | |
| tree | 291f446b3c9279b8a01145f429a3f5fb31aa8d50 /testautomation/global | |
| parent | 0993f5d41ba8360787b8c48ff7502bc82fb6cf7f (diff) | |
| parent | 846df7b7990b79f42455c240f3bb6c432714ba5b (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Diffstat (limited to 'testautomation/global')
| -rwxr-xr-x[-rw-r--r--] | testautomation/global/input/filters/graphic_filters.txt | 1 | ||||
| -rwxr-xr-x | testautomation/global/win/edia_d_h.win | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/testautomation/global/input/filters/graphic_filters.txt b/testautomation/global/input/filters/graphic_filters.txt index 9b63e265bec5..e86e1bdea0f2 100644..100755 --- a/testautomation/global/input/filters/graphic_filters.txt +++ b/testautomation/global/input/filters/graphic_filters.txt @@ -18,6 +18,7 @@ PSD - Adobe Photoshop (*.psd) RAS - Sun Raster Image (*.ras) SGF - StarWriter Graphics Format (*.sgf) SGV - StarDraw 2.0 (*.sgv) +SVG - Scalable Vector Graphics (*.svg) SVM - StarView Metafile (*.svm) TGA - Truevision Targa (*.tga) TIFF - Tagged Image File Format (*.tif;*.tiff) diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 4c9b42bda7d9..f1e3df3988ca 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -47,6 +47,7 @@ UserName sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUS AdabasBrowse sym:DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME MySQLODBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC MySQLJDBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC +MySQLnative sym:dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE MySQLDatabaseName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME MySQLODBCDSName sym:DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE MySQLHostName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER |