[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry

[Tomaž Vajngerl]

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

New commits:
commit 33a4dccfa23a653b60b81e5b1882e8228f5ad5ac
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Fri Apr 22 19:29:39 2016 +0900

    tdf#97887: add Intel driver 5.2.0.10049 to blacklist
    
    Change-Id: Ied93077ad22490ff02fe0f1e0e90ff01eb4c7b88
    (cherry picked from commit 4dd94c6637c503b7cf6e551a8b658a688d6a79ca)
    Reviewed-on: https://gerrit.libreoffice.org/24297
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6adfa44a..718699c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5626,7 +5626,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;Windows//Intel\(R\) Corporation//4\.2\.0\.99</value>
+  <value oor:separator=";">Windows//Intel\(R\) Corporation//9\.17\.10\.2884;Windows//Intel\(R\) Corporation//4\.2\.0\.99;Windows//Intel\(R\) Corporation//5\.2\.0\.10049</value>
       </prop>
       <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
         <!-- UIHints: Tools - Options General OpenCL  -->