diff options
| author | Albert Astals Cid <aacid@kde.org> | 2013-11-18 22:58:28 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2013-11-18 22:58:28 +0100 |
| commit | c01cee165392ba8297e4168111a66d2acb272a99 (patch) | |
| tree | b395814b6412d76d8107c1ac06defedc38738df5 /TODO | |
| parent | 07c255482f7ec8a8cfd4eaeaf7b07de317bbcc7a (diff) | |
| parent | 47605a8aaf85bee21601219b04c0c8e6cf982507 (diff) | |
Merge remote-tracking branch 'origin/poppler-0.24'
Conflicts:
poppler/Catalog.cc
poppler/Catalog.h
Diffstat (limited to 'TODO')
0 files changed, 0 insertions, 0 deletions