aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/psnames/pspic.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-121-1/+8
|\ | | | | | | | | | | | | | | 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-1/+8
| |
* | svn merge ^/branches/releasedmarha2009-12-221-1/+1
|/
* Updated to freetype-2.3.11marha2009-12-211-0/+54