-
Albert Astals Cid authored
Conflicts: poppler/CairoOutputDev.cc poppler/CairoOutputDev.h poppler/FontInfo.cc poppler/GfxFont.cc poppler/GfxState.cc poppler/GlobalParams.cc poppler/GlobalParams.h poppler/Lexer.cc
ea6bc195
Conflicts: poppler/CairoOutputDev.cc poppler/CairoOutputDev.h poppler/FontInfo.cc poppler/GfxFont.cc poppler/GfxState.cc poppler/GlobalParams.cc poppler/GlobalParams.h poppler/Lexer.cc