Merge remote-tracking branch 'mozilla/master' into cidtype2

Conflicts: test/test_manifest.json
2025-04-20 15:18:08 +02:00 · 2013-03-02 16:09:00 -06:00 · 2013-03-02 16:09:00 -06:00 · 32938d3a66
commit 32938d3a66
parent 96f6fcf8ba de9f0a9435
4 changed files with 24 additions and 1 deletions
--- a/test/pdfs/P020121130574743273239.pdf.link
+++ b/test/pdfs/P020121130574743273239.pdf.link
@ -0,0 +1 @@
+http://image.haier.com/manual/japan/wash_machine/201211/P020121130574743273239.pdf
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@ -937,6 +937,15 @@
      "link": true,
      "type": "eq"
    },
+    {  "id": "p020121130574743273239",
+      "file": "pdfs/P020121130574743273239.pdf",
+      "md5": "271b65885d42d174cbc597ca89becb1a",
+      "rounds": 1,
+      "link": true,
+      "firstPage": 1,
+      "lastPage": 1,
+      "type": "eq"
+    },
    {  "id": "sfaa_japanese",
      "file": "pdfs/SFAA_Japanese.pdf",
      "md5": "b961bbc0d05bdd6d91041bca60ec8e8b",
				`@ -0,0 +1 @@`
				`http://image.haier.com/manual/japan/wash_machine/201211/P020121130574743273239.pdf`