From: notmasteryet <async.processingjs@yahoo.com>
Date: Thu, 15 Sep 2011 02:45:12 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1347db797c911c9813a45a784b23a573892c1caf;p=pdf.js.git

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

Conflicts:
	test/test_manifest.json
---

1347db797c911c9813a45a784b23a573892c1caf
diff --cc test/test_manifest.json
index 7893faa,3734ee9..9dda577
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -110,10 -110,10 +110,16 @@@
         "rounds": 1,
         "type": "eq"
      },
+     {  "id": "artofwar",
+        "file": "pdfs/artofwar.pdf",
+        "link": true,
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "fips197",
 +       "file": "pdfs/fips197.pdf",
 +       "link": true,
 +       "rounds": 1,
 +       "type": "load"
      }
  ]