aboutsummaryrefslogtreecommitdiff
path: root/tools/plink/makefile
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 11:18:17 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 11:18:17 +0200
commit039fb6c83783fff3b92f1e7934ce4702cedb1722 (patch)
treebb971ed2e247f7d311b696e62c7ed4d66b199b6d /tools/plink/makefile
parent84f6a75a56f4749f91a51a161c1989cbc8807b80 (diff)
parentfa791414601df61d20d860299dba80fdb62565df (diff)
downloadvcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.tar.gz
vcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.tar.bz2
vcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Upgraded freetype to 2.5.0.1 Conflicts: freetype/src/base/ftcalc.c freetype/src/base/ftgloadr.c freetype/src/base/ftgxval.c freetype/src/base/ftotval.c freetype/src/base/ftoutln.c freetype/src/base/ftpfr.c freetype/src/base/fttrigon.c freetype/src/cff/cffobjs.c freetype/src/psaux/afmparse.c freetype/src/psnames/psmodule.c freetype/src/raster/ftraster.c freetype/src/raster/ftrend1.c freetype/src/sfnt/ttsbit.c freetype/src/sfnt/ttsbit0.c freetype/src/truetype/ttobjs.c freetype/src/truetype/ttsubpix.c freetype/src/type1/t1afm.c
Diffstat (limited to 'tools/plink/makefile')
0 files changed, 0 insertions, 0 deletions