diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-13 15:24:40 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-13 15:24:52 +0200 |
| commit | 8003afa1f35821e6f8ca8b917b9d446219b6a1ae (patch) | |
| tree | d44aaa0cbd3f3b657318afaf275abe55a4d0fdcf /officecfg | |
| parent | d7b8a41282800e9e7d2b44deae372dd23435e444 (diff) | |
Blacklist has precedence over whitelist, so order them like that
Change-Id: I0cf00abd582aaaaa4be4d385a6ef4f199c7aa0bc
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 42b28bcc86a0..8a74759c9651 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1389,19 +1389,19 @@ </info> <value/> </prop> - <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false"> + <prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Formula --> <info> - <desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be good. Has higher priority than OpenCLBlackList. Each entry is a string consisting of five parts separated by slashes. In case a slash occurs inside a part, it is prefixed by a backslash. And in case a backslash occurs inside a part, it is also prefixed by another backslash. Any part might contain a single asterisk as a wildcard, matching any value, but there is no more generic regexp support.</desc> + <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 six parts separated by slashes. 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. Any part might contain a single asterisk as a wildcard, matching any value, but there is no more generic regexp support. Has higher priority than OpenCLWhiteList.</desc> </info> - <value oor:separator=";">Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)/</value> + <value oor:separator=";">Windows/*/Intel(R) Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4</value> </prop> - <prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false"> + <prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Formula --> <info> - <desc>Like OpenCLWhiteList, but for combinations known to be bad.</desc> + <desc>Like OpenCLWhiteList, but for combinations known to be good.</desc> </info> - <value oor:separator=";">Windows/*/Intel(R) Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4</value> + <value oor:separator=";">Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)/</value> </prop> </group> <group oor:name="Syntax"> |