[Libreoffice-commits] core.git: officecfg/registry

[Miklos Vajna]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 452b1872af72d7fb31101aa2fa35aeaf18e41a10
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Sep 2 09:17:58 2015 +0200

    officecfg: blacklist one more intel opencl driver version
    
    My machine has both an intel and an nvidia vga card, and both support
    opencl. When the intel one is not blacklisted, then
    CppunitTest_sc_opencl_test's testFinancialXirrFormula() fails all the
    time. With the blacklist the nvidia one is used during the tests and
    the test passes just fine.
    
    Change-Id: Ib539faebcaf51867bdc1923f896219afcf92b5ef

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 7e722ca..27b662e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5635,7 +5635,7 @@
         <info>
           <desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
         </info>
-        <value oor:separator=";">Windows//Intel\(R\) Corporation//9\.17\.10\.2884</value>
+	<value oor:separator=";">Windows//Intel\(R\) Corporation//9\.17\.10\.2884;Windows//Intel\(R\) Corporation//4\.2\.0\.99</value>
       </prop>
       <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
         <!-- UIHints: Tools - Options General OpenCL  -->