diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:26 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:26 +0100 |
| commit | 3b7ab82aee60aec1e47c1e253d3977a3fc011f5b (patch) | |
| tree | 1ebee7adb28ba3175deee3948aee8f5489d9b509 /officecfg | |
| parent | 486dd9082e177aa63294f76d6a75b08dde5957e5 (diff) | |
| parent | 61879c218dd0e6e94884e7c6e06e3c5c18540b4a (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
basic/source/runtime/makefile.mk
basic/source/runtime/step2.cxx
desktop/prj/build.lst
desktop/source/app/app.cxx
desktop/source/deployment/registry/dp_backend.cxx
drawinglayer/source/attribute/fontattribute.cxx
editeng/inc/editeng/fontitem.hxx
editeng/source/editeng/edtspell.cxx
editeng/source/misc/svxacorr.cxx
framework/inc/services/substitutepathvars.hxx
framework/source/services/substitutepathvars.cxx
sfx2/qa/cppunit/makefile.mk
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/objxtor.cxx
svx/source/dialog/svxruler.cxx
sysui/desktop/icons/so9_base_app.ico
sysui/desktop/icons/so9_calc_app.ico
sysui/desktop/icons/so9_draw_app.ico
sysui/desktop/icons/so9_impress_app.ico
sysui/desktop/icons/so9_main_app.ico
sysui/desktop/icons/so9_math_app.ico
sysui/desktop/icons/so9_writer_app.ico
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/db.cxx
xmlhelp/source/cxxhelp/provider/db.hxx
Diffstat (limited to 'officecfg')
| -rwxr-xr-x | officecfg/registry/data/org/openoffice/Office/Canvas.xcu | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu index 00030d71bf9b..a51ff5b244c8 100755 --- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu @@ -14,6 +14,8 @@ <value> <!-- Matrox G550 - blank display on 2nd head --> 4139 9511 260313131 1 5 13 1 1320 + <!-- Matrox G550 - blank display (single head?) --> + 4139 9511 255987755 1 6 12 1 1930 <!-- Matrox G400 - random crashes --> 4139 1317 54005803 4 5 12 1 1200 <!-- Mobility Radeon M6 16MB - blank screen 1st slide on internal LCD --> |