tree f92bda4f8cb744efd05f0f03688cbe3b21642908
parent 64100e7f1f6b550e952838fce38615ec3788e17c
parent a2f0e4b1fd8b3d9675cc00a561094bd78a63d048
author Albert Astals Cid <aacid@kde.org> 1388703869 +0100
committer Albert Astals Cid <aacid@kde.org> 1388703869 +0100

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

Conflicts:
	CMakeLists.txt
	NEWS
	configure.ac
	cpp/Doxyfile
	qt4/src/Doxyfile
	qt5/src/Doxyfile