aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/base/basepic.c
Commit message (Collapse)AuthorAgeFilesLines
* Solved freetype compilation problemsmarha2014-06-261-1/+1
|
* Merge remote-tracking branch 'origin/released'marha2014-06-261-7/+6
|\ | | | | | | | | * origin/released: Updated to freetype 2.5.3
| * Updated to freetype 2.5.3marha2014-06-261-7/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-131-12/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-12/+28
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Merge remote-tracking branch 'origin/released'marha2012-03-121-17/+27
|\| | | | | | | | | | | | | | | 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-17/+27
| |
* | svn merge ^/branches/releasedmarha2009-12-221-1/+1
|/
* Updated to freetype-2.3.11marha2009-12-211-0/+83