| commit | 98b7cfd289abb53a745a88d6ec99e95df477fc8f | [log] [tgz] |
|---|---|---|
| author | Albert Astals Cid <aacid@kde.org> | Fri Nov 09 00:38:19 2012 +0100 |
| committer | Albert Astals Cid <aacid@kde.org> | Fri Nov 09 00:38:19 2012 +0100 |
| tree | fdabf97a5c31f702ceff4dfa1642744693137a1b | |
| parent | 40efa72987ebf62cbf2c761c10a209e2e6be612e [diff] | |
| parent | d254174e08146115ad04ac1f1bf82bb26e56c684 [diff] |
Merge remote-tracking branch 'origin/poppler-0.20' Conflicts: poppler/Form.cc