aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/autofit/afpic.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-02-131-14/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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-14/+34
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Merge remote-tracking branch 'origin/released'marha2012-03-121-3/+10
|\| | | | | | | | | | | | | | | 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-3/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-181-11/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * Switched to freetype 2.4.5marha2011-07-181-11/+16
| |
* | svn merge ^/branches/releasedmarha2009-12-221-1/+1
|/
* Updated to freetype-2.3.11marha2009-12-211-0/+64