From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 29 Dec 2011 20:37:15 +0000 (-0800)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c8445753d23e953ac8d5d46662320677e254f76;p=pdf.js.git

Merge upstream.
---

7c8445753d23e953ac8d5d46662320677e254f76
diff --cc test/pdfs/.gitignore
index 3d63679,fd541a0..9569807
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -20,5 -20,4 +20,5 @@@
  !scan-bad.pdf
  !freeculture.pdf
  !issue918.pdf
+ !smaskdim.pdf
 +!type4psfunc.pdf
-