Commit 98b7cfd2 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Merge remote-tracking branch 'origin/poppler-0.20'

Conflicts:
	poppler/Form.cc
parents 40efa729 d254174e
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment