Module Name: xsrc Committed By: christos Date: Mon May 16 22:18:39 UTC 2016
Modified Files: xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in xsrc/external/mit/freetype/dist/src/cff: cffload.c xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c xsrc/external/mit/freetype/dist/src/lzw: ftzopen.c xsrc/external/mit/freetype/dist/src/sfnt: ttcmap.c xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c Added Files: xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftdriver.h ftgloadr.h ftmemory.h ftobjs.h ftpic.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h Removed Files: xsrc/external/mit/freetype/dist/builds/unix: mkinstalldirs xsrc/external/mit/freetype/dist/include: freetype.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h xsrc/external/mit/freetype/dist/include/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/internal: autohint.h ftcalc.h ftdebug.h ftdriver.h ftgloadr.h ftmemory.h ftobjs.h ftpic.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/internal/services: svbdf.h svcid.h svfntfmt.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h xsrc/external/mit/freetype/dist/src/autofit: hbshim.c hbshim.h Log Message: resolve conflicts; move include files back where the distribution has them. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/unix/mkinstalldirs cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/freetype/dist/include/freetype.h \ xsrc/external/mit/freetype/dist/include/ftadvanc.h \ xsrc/external/mit/freetype/dist/include/ftautoh.h \ xsrc/external/mit/freetype/dist/include/ftbbox.h \ xsrc/external/mit/freetype/dist/include/ftbdf.h \ xsrc/external/mit/freetype/dist/include/ftbitmap.h \ xsrc/external/mit/freetype/dist/include/ftbzip2.h \ xsrc/external/mit/freetype/dist/include/ftcache.h \ xsrc/external/mit/freetype/dist/include/ftcffdrv.h \ xsrc/external/mit/freetype/dist/include/ftcid.h \ xsrc/external/mit/freetype/dist/include/fterrdef.h \ xsrc/external/mit/freetype/dist/include/ftgasp.h \ xsrc/external/mit/freetype/dist/include/ftglyph.h \ xsrc/external/mit/freetype/dist/include/ftgxval.h \ xsrc/external/mit/freetype/dist/include/ftgzip.h \ xsrc/external/mit/freetype/dist/include/ftimage.h \ xsrc/external/mit/freetype/dist/include/ftincrem.h \ xsrc/external/mit/freetype/dist/include/ftlcdfil.h \ xsrc/external/mit/freetype/dist/include/ftlist.h \ xsrc/external/mit/freetype/dist/include/ftlzw.h \ xsrc/external/mit/freetype/dist/include/ftmm.h \ xsrc/external/mit/freetype/dist/include/ftmodapi.h \ xsrc/external/mit/freetype/dist/include/ftotval.h \ xsrc/external/mit/freetype/dist/include/ftoutln.h \ xsrc/external/mit/freetype/dist/include/ftpfr.h \ xsrc/external/mit/freetype/dist/include/ftrender.h \ xsrc/external/mit/freetype/dist/include/ftstroke.h \ xsrc/external/mit/freetype/dist/include/ftsynth.h \ xsrc/external/mit/freetype/dist/include/ftsystem.h \ xsrc/external/mit/freetype/dist/include/fttrigon.h \ xsrc/external/mit/freetype/dist/include/ftttdrv.h \ xsrc/external/mit/freetype/dist/include/fttypes.h \ xsrc/external/mit/freetype/dist/include/ftwinfnt.h \ xsrc/external/mit/freetype/dist/include/t1tables.h \ xsrc/external/mit/freetype/dist/include/ttnameid.h \ xsrc/external/mit/freetype/dist/include/tttables.h \ xsrc/external/mit/freetype/dist/include/ttunpat.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/include/ftchapters.h \ xsrc/external/mit/freetype/dist/include/ftfntfmt.h cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/freetype/dist/include/fterrors.h \ xsrc/external/mit/freetype/dist/include/ftmac.h \ xsrc/external/mit/freetype/dist/include/ftmoderr.h \ xsrc/external/mit/freetype/dist/include/ftsizes.h \ xsrc/external/mit/freetype/dist/include/ftsnames.h \ xsrc/external/mit/freetype/dist/include/tttags.h cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/freetype/dist/include/config/ftconfig.h \ xsrc/external/mit/freetype/dist/include/config/ftoption.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/include/config/ftheader.h \ xsrc/external/mit/freetype/dist/include/config/ftstdlib.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/include/config/ftmodule.h cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/freetype/dist/include/freetype/freetype.h \ xsrc/external/mit/freetype/dist/include/freetype/ftadvanc.h \ xsrc/external/mit/freetype/dist/include/freetype/ftautoh.h \ xsrc/external/mit/freetype/dist/include/freetype/ftbbox.h \ xsrc/external/mit/freetype/dist/include/freetype/ftbdf.h \ xsrc/external/mit/freetype/dist/include/freetype/ftbitmap.h \ xsrc/external/mit/freetype/dist/include/freetype/ftbzip2.h \ xsrc/external/mit/freetype/dist/include/freetype/ftcache.h \ xsrc/external/mit/freetype/dist/include/freetype/ftcffdrv.h \ xsrc/external/mit/freetype/dist/include/freetype/ftchapters.h \ xsrc/external/mit/freetype/dist/include/freetype/ftcid.h \ xsrc/external/mit/freetype/dist/include/freetype/fterrdef.h \ xsrc/external/mit/freetype/dist/include/freetype/fterrors.h \ xsrc/external/mit/freetype/dist/include/freetype/ftgasp.h \ xsrc/external/mit/freetype/dist/include/freetype/ftglyph.h \ xsrc/external/mit/freetype/dist/include/freetype/ftgxval.h \ xsrc/external/mit/freetype/dist/include/freetype/ftgzip.h \ xsrc/external/mit/freetype/dist/include/freetype/ftimage.h \ xsrc/external/mit/freetype/dist/include/freetype/ftincrem.h \ xsrc/external/mit/freetype/dist/include/freetype/ftlcdfil.h \ xsrc/external/mit/freetype/dist/include/freetype/ftlist.h \ xsrc/external/mit/freetype/dist/include/freetype/ftlzw.h \ xsrc/external/mit/freetype/dist/include/freetype/ftmac.h \ xsrc/external/mit/freetype/dist/include/freetype/ftmm.h \ xsrc/external/mit/freetype/dist/include/freetype/ftmodapi.h \ xsrc/external/mit/freetype/dist/include/freetype/ftmoderr.h \ xsrc/external/mit/freetype/dist/include/freetype/ftotval.h \ xsrc/external/mit/freetype/dist/include/freetype/ftoutln.h \ xsrc/external/mit/freetype/dist/include/freetype/ftpfr.h \ xsrc/external/mit/freetype/dist/include/freetype/ftrender.h \ xsrc/external/mit/freetype/dist/include/freetype/ftsizes.h \ xsrc/external/mit/freetype/dist/include/freetype/ftsnames.h \ xsrc/external/mit/freetype/dist/include/freetype/ftstroke.h \ xsrc/external/mit/freetype/dist/include/freetype/ftsynth.h \ xsrc/external/mit/freetype/dist/include/freetype/ftsystem.h \ xsrc/external/mit/freetype/dist/include/freetype/fttrigon.h \ xsrc/external/mit/freetype/dist/include/freetype/fttypes.h \ xsrc/external/mit/freetype/dist/include/freetype/ftwinfnt.h \ xsrc/external/mit/freetype/dist/include/freetype/t1tables.h \ xsrc/external/mit/freetype/dist/include/freetype/ttnameid.h \ xsrc/external/mit/freetype/dist/include/freetype/tttables.h \ xsrc/external/mit/freetype/dist/include/freetype/tttags.h \ xsrc/external/mit/freetype/dist/include/freetype/ttunpat.h cvs rdiff -u -r0 -r1.7 \ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/freetype/dist/include/freetype/config/ftheader.h \ xsrc/external/mit/freetype/dist/include/freetype/config/ftmodule.h \ xsrc/external/mit/freetype/dist/include/freetype/config/ftstdlib.h cvs rdiff -u -r0 -r1.6 \ xsrc/external/mit/freetype/dist/include/freetype/config/ftoption.h cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/freetype/dist/include/freetype/internal/autohint.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftcalc.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftdebug.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftdriver.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftgloadr.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftmemory.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftobjs.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftpic.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftrfork.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftserv.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftstream.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/fttrace.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/ftvalid.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/internal.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/psaux.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/pshints.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/sfnt.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/t1types.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/tttypes.h cvs rdiff -u -r0 -r1.3 \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svbdf.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svcid.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svgldict.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svgxval.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svkern.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svmm.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svotval.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svpfr.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svpostnm.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svprop.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svpscmap.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svpsinfo.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svsfnt.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svttcmap.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svtteng.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svttglyf.h \ xsrc/external/mit/freetype/dist/include/freetype/internal/services/svwinfnt.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/include/internal/autohint.h \ xsrc/external/mit/freetype/dist/include/internal/ftdebug.h \ xsrc/external/mit/freetype/dist/include/internal/ftdriver.h \ xsrc/external/mit/freetype/dist/include/internal/ftmemory.h \ xsrc/external/mit/freetype/dist/include/internal/ftpic.h \ xsrc/external/mit/freetype/dist/include/internal/ftrfork.h \ xsrc/external/mit/freetype/dist/include/internal/ftserv.h \ xsrc/external/mit/freetype/dist/include/internal/ftstream.h \ xsrc/external/mit/freetype/dist/include/internal/fttrace.h \ xsrc/external/mit/freetype/dist/include/internal/internal.h \ xsrc/external/mit/freetype/dist/include/internal/psaux.h \ xsrc/external/mit/freetype/dist/include/internal/t1types.h \ xsrc/external/mit/freetype/dist/include/internal/tttypes.h cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/freetype/dist/include/internal/ftcalc.h \ xsrc/external/mit/freetype/dist/include/internal/ftgloadr.h \ xsrc/external/mit/freetype/dist/include/internal/ftobjs.h \ xsrc/external/mit/freetype/dist/include/internal/ftvalid.h \ xsrc/external/mit/freetype/dist/include/internal/pshints.h \ xsrc/external/mit/freetype/dist/include/internal/sfnt.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/include/internal/services/svbdf.h \ xsrc/external/mit/freetype/dist/include/internal/services/svcid.h \ xsrc/external/mit/freetype/dist/include/internal/services/svgldict.h \ xsrc/external/mit/freetype/dist/include/internal/services/svgxval.h \ xsrc/external/mit/freetype/dist/include/internal/services/svkern.h \ xsrc/external/mit/freetype/dist/include/internal/services/svmm.h \ xsrc/external/mit/freetype/dist/include/internal/services/svotval.h \ xsrc/external/mit/freetype/dist/include/internal/services/svpfr.h \ xsrc/external/mit/freetype/dist/include/internal/services/svpostnm.h \ xsrc/external/mit/freetype/dist/include/internal/services/svprop.h \ xsrc/external/mit/freetype/dist/include/internal/services/svpscmap.h \ xsrc/external/mit/freetype/dist/include/internal/services/svpsinfo.h \ xsrc/external/mit/freetype/dist/include/internal/services/svsfnt.h \ xsrc/external/mit/freetype/dist/include/internal/services/svttcmap.h \ xsrc/external/mit/freetype/dist/include/internal/services/svtteng.h \ xsrc/external/mit/freetype/dist/include/internal/services/svttglyf.h \ xsrc/external/mit/freetype/dist/include/internal/services/svwinfnt.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/include/internal/services/svfntfmt.h cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/freetype/dist/src/autofit/hbshim.c cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/src/autofit/hbshim.h cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/freetype/dist/src/cff/cffload.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/freetype/dist/src/lzw/ftzopen.c cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
diffs are larger than 1MB and have been omitted