Skip to content
  • Albert Astals Cid's avatar
    Merge branch 'master' into xpdf303merge · ea6bc195
    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