vcxsrv/freetype/src/psaux/t1cmap.c, branch master VcXsrv Windows X Server (X2Go/Arctica Builds) https://openid.arctica-project.org/vcxsrv/atom?h=master 2015-06-15T19:36:28+00:00 Merge remote-tracking branch 'origin/released' 2015-06-15T19:36:28+00:00 marha marha@users.sourceforge.net 2015-06-15T19:36:28+00:00 urn:sha1:008a8d8051786badb83e455bd9281103ba9a6470 Conflicts: freetype/src/base/ftfntfmt.c freetype/src/cache/ftcimage.c freetype/src/cid/cidriver.c freetype/src/truetype/ttdriver.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c openssl/Makefile Update to freetype 2.6 2015-06-15T18:22:43+00:00 marha marha@users.sourceforge.net 2015-06-15T18:22:43+00:00 urn:sha1:0b3be550b20ad9f991f77bf979b2c306a7d4ef11 Merged origin/release (checked in because wanted to merge new stuff) 2015-02-22T20:39:56+00:00 marha marha@users.sourceforge.net 2015-02-22T20:39:56+00:00 urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b Upgraded to freetype 2.5.5 2015-02-22T13:47:01+00:00 marha marha@users.sourceforge.net 2015-02-22T13:47:01+00:00 urn:sha1:7785694244cdfc5939ca4754cab4e08bd6980f99 Solved freetype compilation problems 2014-06-26T08:37:02+00:00 marha marha@users.sourceforge.net 2014-06-26T08:37:02+00:00 urn:sha1:095ea6e18c55df550fda14f72c2d174af9b239ba Merge remote-tracking branch 'origin/released' 2012-03-12T09:48:52+00:00 marha marha@users.sourceforge.net 2012-03-12T09:48:52+00:00 urn:sha1:485b633824020c557eb60258e1d36975c8c44770 Conflicts: freetype/src/base/ftrfork.c freetype/src/cff/cffpic.c freetype/src/pfr/pfrobjs.c freetype/src/winfonts/winfnt.c Updated to freetype-2.4.9 2012-03-12T09:33:22+00:00 marha marha@users.sourceforge.net 2012-03-12T09:33:22+00:00 urn:sha1:41bd254198b8b879a562a85f7dc868c3c0f7fbc1 svn merge ^/branches/released 2009-12-22T14:14:24+00:00 marha marha@users.sourceforge.net 2009-12-22T14:14:24+00:00 urn:sha1:4284aeba874b9168f2228c59639bec8346a56796 Updated to freetype-2.3.11 2009-12-21T15:22:51+00:00 marha marha@users.sourceforge.net 2009-12-21T15:22:51+00:00 urn:sha1:1ee02cd0419021c3d4950af2619da39c6e9c47f0 Changes for VC compilation 2009-07-12T18:20:04+00:00 marha marha@users.sourceforge.net 2009-07-12T18:20:04+00:00 urn:sha1:da8fe31a7ba4acf109097d5696ad0145b991cdfd