make conflict
Merge branch 'master' of github.com:panyihua/SumatraPDF_SpecialPrint