[poppler] 2 commits - regtest/.gitignore utils/.gitignore utils/pdfextract.1 utils/pdfmerge.1

[Albert Astals Cid]

 regtest/.gitignore |    1 +
 utils/.gitignore   |    2 ++
 utils/pdfextract.1 |    3 ++-
 utils/pdfmerge.1   |    3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 69707f0a9b5a94c80817039db943fb4f26e743e3
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Sep 19 22:00:34 2011 +0930

    Update .gitignore

diff --git a/regtest/.gitignore b/regtest/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/regtest/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/utils/.gitignore b/utils/.gitignore
index d8a48f4..d18e8c9 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -2,9 +2,11 @@
 .libs
 Makefile
 Makefile.in
+pdfextract
 pdffonts
 pdfimages
 pdfinfo
+pdfmerge
 pdftohtml
 pdftoppm
 pdftops
commit 0de477817e424078cfcfcae114e7745809f0848d
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Sep 19 21:57:07 2011 +0930

    utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages

diff --git a/utils/pdfextract.1 b/utils/pdfextract.1
index 429e66d..2760045 100644
--- a/utils/pdfextract.1
+++ b/utils/pdfextract.1
@@ -43,6 +43,7 @@ extracts all pages from sample.pdf, if i.e. sample.pdf has 3 pages, it produces
 .TP
 sample-1.pdf, sample-2.pdf, sample-3.pdf
 .SH AUTHOR
-The pdfextract software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+The pdfextract software and documentation are copyright 1996-2004 Glyph
+& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
 .BR pdfmerge (1),
diff --git a/utils/pdfmerge.1 b/utils/pdfmerge.1
index a6571d1..aecf555 100644
--- a/utils/pdfmerge.1
+++ b/utils/pdfmerge.1
@@ -27,6 +27,7 @@ pdfmerge sample1.pdf sample2.pdf sample.pdf
 .TP
 merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf
 .SH AUTHOR
-The pdfmerge software and documentation are copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+The pdfmerge software and documentation are copyright 1996-2004 Glyph & Cog, LLC
+and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
 .SH "SEE ALSO"
 .BR pdfextract (1),