From: notmasteryet <async.processingjs@yahoo.com>
Date: Thu, 5 Jan 2012 01:57:08 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into tree-53
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=caacd31a2cf381551d9e6825f25c96e483d201cf;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into tree-53

Conflicts:
	test/test_manifest.json
---

caacd31a2cf381551d9e6825f25c96e483d201cf
diff --cc test/test_manifest.json
index fd2eb1e,684f7aa..7954aa0
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -382,11 -382,11 +382,18 @@@
        "rounds": 1,
        "type": "eq"
      },
 +    {  "id": "ocs",
 +      "file": "pdfs/ocs.pdf",
 +      "md5": "2ade57e954ae7632749cf328daeaa7a8",
 +      "rounds": 1,
 +      "link": true,
 +      "type": "load"
++    },
+     {  "id": "issue1015",
+       "file": "pdfs/issue1015.pdf",
+       "md5": "b61503d1b445742b665212866afb60e2",
+       "rounds": 1,
+       "link": true,
+       "type": "eq"
      }
  ]