Merge branch 'master' into startpage startpage
authorAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Tue, 8 Jun 2010 22:43:12 +0000 (22:43 +0000)
committerAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Tue, 8 Jun 2010 22:43:12 +0000 (22:43 +0000)
commit3e69571a61c5ebbd53e6759b73008338a8ea4239
tree3c3d3fb8254f1bc5850b4d09d5aecf65caa8ac4f
parent20f395856f21739e79eeab275beec7a3d133d568
parent3bf6a6c26f5dda79b6de3b236c9867fcf6a3f17b
Merge branch 'master' into startpage
lib/pdf/BitmapOutputDev.cc
lib/pdf/xpdf-changes.patch