Searched full:merge (Results 1 – 25 of 8869) sorted by relevance
12345678910>>...355
| /third_party/backends/testsuite/tools/data/ |
| D | hal.ref | 76 <merge key="scanner.access_method" type="string">proprietary</merge>
81 <merge key="scanner.access_method" type="string">proprietary</merge>
86 <merge key="scanner.access_method" type="string">proprietary</merge>
91 <merge key="scanner.access_method" type="string">proprietary</merge>
96 <merge key="scanner.access_method" type="string">proprietary</merge>
101 <merge key="scanner.access_method" type="string">proprietary</merge>
106 <merge key="scanner.access_method" type="string">proprietary</merge>
111 <merge key="scanner.access_method" type="string">proprietary</merge>
116 <merge key="scanner.access_method" type="string">proprietary</merge>
121 <merge key="scanner.access_method" type="string">proprietary</merge>
[all …]
|
| D | hal-new.ref | 76 <merge key="scanner.access_method" type="string">proprietary</merge>
81 <merge key="scanner.access_method" type="string">proprietary</merge>
86 <merge key="scanner.access_method" type="string">proprietary</merge>
91 <merge key="scanner.access_method" type="string">proprietary</merge>
96 <merge key="scanner.access_method" type="string">proprietary</merge>
101 <merge key="scanner.access_method" type="string">proprietary</merge>
106 <merge key="scanner.access_method" type="string">proprietary</merge>
111 <merge key="scanner.access_method" type="string">proprietary</merge>
116 <merge key="scanner.access_method" type="string">proprietary</merge>
121 <merge key="scanner.access_method" type="string">proprietary</merge>
[all …]
|
| /third_party/skia/m133/third_party/externals/libwebp/ |
| D | ChangeLog | 5 74555950 Merge "vwebp: fix window title when options are given" into 1.4.0
10 b3d1b2cb Merge changes I26f4aa22,I83386b6c,I320ed1a2 into main
18 955a3d14 Merge "muxread,MuxGet: add an assert" into main
24 8a7e9112 Merge "CMakeLists.txt: apply cmake-format" into main
25 7fac6c1b Merge "Copy C code to not have multiplication overflow" into main
26 e2922e43 Merge "Check for the presence of the ANDROID_ABI variable" into main
29 661c1b66 Merge "windows exports: use dllexport attribute, instead of visibility." into main
43 89c5b917 Merge "BuildHuffmanTable check sorted[] array bounds before writing" into main
53 e7b78d43 Merge "Fix bug in FromLinearLog100." into main
54 15a1309e Merge "webp-lossless-bitstream-spec: delete extra blank line" into main
[all …]
|
| /third_party/skia/third_party/externals/libwebp/ |
| D | ChangeLog | 8 e0241154 Merge "libwebp/CMake: Add <BUILD_INTERFACE> to webp incl" into main
12 26f4aa01 Merge "alpha_processing: fix visual studio warnings" into main
14 46d844e6 Merge "cpu.cmake: fix compiler flag detection w/3.17.0+" into main
15 298d26ea Merge changes I593adf92,If20675e7,Ifac68eac into main
21 a2e18f10 Merge "WebPConfig.config.in: correct WEBP_INCLUDE_DIRS" into main
22 e1a8d4f3 Merge "bit_reader_inl_utils: uniformly apply WEBP_RESTRICT" into main
45 315abbd6 Merge "Revert "Do not use a palette for one color images.""
46 eae815d0 Merge changes Ica3bbf75,I82f82954
72 652aa344 Merge "Use BitCtz for FastSLog2Slow_C"
77 fee64287 Merge "wicdec,icc: treat unsupported op as non-fatal"
[all …]
|
| /third_party/noto-cjk/ |
| D | .gitattributes | 11 *.tgz filter=lfs diff=lfs merge=lfs -text
12 *.trp filter=lfs diff=lfs merge=lfs -text
13 *.apk filter=lfs diff=lfs merge=lfs -text
14 *.jar filter=lfs diff=lfs merge=lfs -text
15 *.mp4 filter=lfs diff=lfs merge=lfs -text
16 *.zip filter=lfs diff=lfs merge=lfs -text
17 *.asm filter=lfs diff=lfs merge=lfs -text
18 *.8svn filter=lfs diff=lfs merge=lfs -text
19 *.9svn filter=lfs diff=lfs merge=lfs -text
20 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/backends/ChangeLogs/ |
| D | ChangeLog-1.2.1 | 21 Merge: 573ca4b45359 6220b21429f5
25 Merge branch 'uk_update2' into 'master'
29 See merge request sane-project/backends!779
47 Merge: 4033ea23b692 370547fc6006
51 Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1' into 'master'
57 See merge request sane-project/backends!777
66 Merge: 7e85f737d090 109a82f0feb7
70 Merge branch 'escl-add-espon-L3160' into 'master'
76 See merge request sane-project/backends!776
85 Merge: fea8ad2b993b e840ad7fa3af
[all …]
|
| D | ChangeLog-1.0.31 | 14 Merge: 8f19b77f45e9 d65d121e6d2a
18 Merge branch '38-macos-device-0x03f0-0x1305-at-020-002-is-not-configured' into 'release/1.0.31'
22 See merge request sane-project/backends!504
31 Merge: 80643db457d1 48fee0b33f4b
35 Merge branch 'release/1.0.31' into 'release/1.0.31'
39 See merge request sane-project/backends!512
74 Merge: 0d5ea59d4378 743290300a22
78 Merge branch 'for-upstream/avision_fix_fastfeed' into 'release/1.0.31'
82 See merge request sane-project/backends!505
103 Merge: 4a4199c33033 0082a9af569a
[all …]
|
| D | ChangeLog-1.0.32 | 29 These were mentioned in the commit logs and merge requests but missing
33 Merge: 102288c22eb3 9c46d6bcaccf
37 Merge branch 'disable-canoscan-4400f' into 'release/1.0.32'
41 See merge request sane-project/backends!592
50 Merge: ef8e403572d9 e3962ad18434
54 Merge branch 'add-files-to-source-tarball' into 'release/1.0.32'
58 See merge request sane-project/backends!593
70 Merge: 1532520fa14b 85f4ef106577
74 Merge branch '433-issues-in-sane-man-pages' into 'release/1.0.32'
78 See merge request sane-project/backends!581
[all …]
|
| D | ChangeLog-1.0.29 | 17 Merge: 3c714b48afb7 8bc98d0f7d37
21 Merge branch '225-fix-genesys-testsuite-compiler-warning' into 'release/1.0.29'
25 See merge request sane-project/backends!309
42 Merge: 3825e0ca6496 fe38a70d73c0
46 Merge branch 'de-minimal-translation-updates' into 'release/1.0.29'
50 See merge request sane-project/backends!312
59 Merge: f22dc84b71a9 b91dca43d504
63 Merge branch 'bellaperez/cat_translations' into 'release/1.0.29'
67 See merge request sane-project/backends!311
80 Merge: 77c92f49af02 f72862ddf8b4
[all …]
|
| /third_party/libevdev/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/libphonenumber/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/sqlite/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/libdrm/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/wpa_supplicant/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/ninja/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/bzip2/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/mtdev/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/markupsafe/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/jinja2/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/libunwind/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/cares/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/gn/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/css-what/ |
| D | .gitattributes | 1 *.tgz filter=lfs diff=lfs merge=lfs -text
2 *.trp filter=lfs diff=lfs merge=lfs -text
3 *.apk filter=lfs diff=lfs merge=lfs -text
4 *.jar filter=lfs diff=lfs merge=lfs -text
5 *.mp4 filter=lfs diff=lfs merge=lfs -text
6 *.zip filter=lfs diff=lfs merge=lfs -text
7 *.asm filter=lfs diff=lfs merge=lfs -text
8 *.8svn filter=lfs diff=lfs merge=lfs -text
9 *.9svn filter=lfs diff=lfs merge=lfs -text
10 *.dylib filter=lfs diff=lfs merge=lfs -text
[all …]
|
| /third_party/typescript/tests/baselines/reference/ |
| D | duplicateIdentifierEnum.errors.txt | 1 …plicateIdentifierEnum_A.ts(2,6): error TS2567: Enum declarations can only merge with namespace or …
2 …plicateIdentifierEnum_A.ts(5,7): error TS2567: Enum declarations can only merge with namespace or …
3 …licateIdentifierEnum_A.ts(9,11): error TS2567: Enum declarations can only merge with namespace or …
4 …icateIdentifierEnum_A.ts(12,12): error TS2567: Enum declarations can only merge with namespace or …
5 …icateIdentifierEnum_A.ts(16,12): error TS2567: Enum declarations can only merge with namespace or …
6 …icateIdentifierEnum_A.ts(19,10): error TS2567: Enum declarations can only merge with namespace or …
7 …licateIdentifierEnum_A.ts(23,6): error TS2567: Enum declarations can only merge with namespace or …
8 …licateIdentifierEnum_A.ts(26,7): error TS2567: Enum declarations can only merge with namespace or …
9 …licateIdentifierEnum_B.ts(1,10): error TS2567: Enum declarations can only merge with namespace or …
10 …plicateIdentifierEnum_B.ts(4,6): error TS2567: Enum declarations can only merge with namespace or …
[all …]
|
| /third_party/json/tests/thirdparty/Fuzzer/test/ |
| D | merge.test | 10 RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-pr…
11 CHECK1: MERGE-OUTER: 3 files, 3 in the initial corpus
12 CHECK1: MERGE-OUTER: 0 new files with 0 new features added
22 RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-pr…
23 CHECK2: MERGE-OUTER: 9 files, 3 in the initial corpus
24 CHECK2: MERGE-OUTER: 3 new files with 3 new features added
27 RUN: LLVMFuzzer-FullCoverageSetTest -merge=1 %tmp/T1 %tmp/T2 2>&1 | FileCheck %s --check-pr…
28 CHECK3: MERGE-OUTER: 12 files, 6 in the initial corpus
29 CHECK3: MERGE-OUTER: 0 new files with 0 new features added
31 # Check that we respect max_len during the merge and don't crash.
[all …]
|
12345678910>>...355