| commit | 381ae2877acace4e8908b07ee5fb442bc19bf814 | [log] [tgz] |
|---|---|---|
| author | Albert Astals Cid <aacid@kde.org> | Fri Jan 03 00:04:29 2014 +0100 |
| committer | Albert Astals Cid <aacid@kde.org> | Fri Jan 03 00:04:29 2014 +0100 |
| tree | f92bda4f8cb744efd05f0f03688cbe3b21642908 | |
| parent | 64100e7f1f6b550e952838fce38615ec3788e17c [diff] | |
| parent | a2f0e4b1fd8b3d9675cc00a561094bd78a63d048 [diff] |
Merge remote-tracking branch 'origin/poppler-0.24' Conflicts: CMakeLists.txt NEWS configure.ac cpp/Doxyfile qt4/src/Doxyfile qt5/src/Doxyfile