From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 19 Mar 2012 17:45:53 +0000 (-0700)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=52a4bcbd4fdb888a912e80fe1b970c17a305cc1a;p=pdf.js.git

Merge upstream.
---

52a4bcbd4fdb888a912e80fe1b970c17a305cc1a
diff --cc test/test_manifest.json
index a1f32a5,f3c045c..59f1339
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -472,12 -472,14 +472,20 @@@
        "rounds": 1,
        "type": "eq"
      },
+     {  "id": "tamreview",
+       "file": "pdfs/TAMReview.pdf",
+       "md5": "8039aba56790d3597d2bc8c794a51301",
+       "rounds": 1,
+       "pageLimit": 5,
+       "link": true,
+       "type": "eq"
+     },
 +    {  "id": "issue1350",
 +      "file": "pdfs/issue1350.pdf",
 +      "md5": "92f72a04a4d9d05b2dd433b51f32ab1f",
 +      "rounds": 1,
 +      "type": "eq"
 +    },
      {  "id": "issue925",
        "file": "pdfs/issue925.pdf",
        "md5": "f58fe943090aff89dcc8e771bc0db4c2",