aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/psnames/pspic.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-06-211-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Upgraded freetype to 2.5.0.1marha2013-06-211-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-131-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Update to following packages: Conflicts: freetype/src/autofit/afhints.c freetype/src/autofit/afmodule.c freetype/src/psaux/psconv.c freetype/src/sfnt/sfntpic.h openssl/Makefile openssl/util/pl/VC-32.pl
| * Update to following packages:marha2013-02-131-6/+9
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Merge remote-tracking branch 'origin/released'marha2012-03-121-15/+30
|\| | | | | | | | | | | | | | | 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.9marha2012-03-121-15/+30
| |
* | svn merge ^/branches/released .marha2010-08-061-6/+8
|\|
| * Updated to freetype 2.4.1marha2010-08-061-6/+8
| |
* | svn merge ^/branches/releasedmarha2009-12-221-1/+1
|/
* Updated to freetype-2.3.11marha2009-12-211-0/+77