From: notmasteryet <async.processingjs@yahoo.com>
Date: Thu, 19 Jan 2012 02:14:43 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f3ab505b41bb4ac7392dc036ff22385c99cc2d9e;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

Conflicts:
	test/test_manifest.json
---

f3ab505b41bb4ac7392dc036ff22385c99cc2d9e
diff --cc test/test_manifest.json
index 2110ea5,6d04597..fce77e0
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -411,10 -411,11 +411,17 @@@
        "link": true,
        "type": "load"
      },
 +    {  "id": "S2-eq",
 +       "file": "pdfs/S2.pdf",
 +       "md5": "d0b6137846df6e0fe058f234a87fb588",
 +       "rounds": 1,
 +       "type": "eq"
++    },
+     {  "id": "issue1055",
+       "file": "pdfs/issue1055.pdf",
+       "md5": "3ba56c2e48dce81da8669b1b9cf98ff0",
+       "rounds": 1,
+       "link": true,
+       "type": "eq"
      }
  ]