From: notmasteryet <async.processingjs@yahoo.com>
Date: Sat, 24 Sep 2011 14:57:59 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into invalidpdf-1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=39ba5324a762b67cced16f4b15d4f8557843bbf8;p=pdf.js.git

Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into invalidpdf-1

Conflicts:
	test/test_manifest.json
---

39ba5324a762b67cced16f4b15d4f8557843bbf8
diff --cc test/test_manifest.json
index 50f3c4c,39d1f50..71738f1
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -152,11 -152,10 +152,17 @@@
         "rounds": 1,
         "type": "load"
      },
+     {  "id": "extgstate",
+        "file": "pdfs/extgstate.pdf",
+        "link": false,
+        "rounds": 1,
+        "type": "load"
++    },
 +    {  "id": "ibwa-bad",
 +       "file": "pdfs/ibwa-bad.pdf",
 +       "link": true,
 +       "rounds": 1,
 +       "skipPages": [ 16 ],
 +       "type": "load"
      }
  ]