# Conflicts: # PdfReader/PdfReader.h # PdfReader/Src/RendererOutputDev.cpp # PdfReader/old/Graphics.cpp