diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
| commit | 3c0d2312573b81e3067bea610a58b1940c075e05 (patch) | |
| tree | 3f025a27d813374f225957801226aa8ee829a33a /freetype/docs/reference/ft2-toc.html | |
| parent | ba033884541714680fd7552ab9d6c8817650f7d8 (diff) | |
| parent | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff) | |
| download | vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2 vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip | |
Merge remote-tracking branch 'origin/released'
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
Diffstat (limited to 'freetype/docs/reference/ft2-toc.html')
| -rw-r--r-- | freetype/docs/reference/ft2-toc.html | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/freetype/docs/reference/ft2-toc.html b/freetype/docs/reference/ft2-toc.html index 824c8f736..98533c69a 100644 --- a/freetype/docs/reference/ft2-toc.html +++ b/freetype/docs/reference/ft2-toc.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.4.4 API Reference</title> +<title>FreeType-2.4.5 API Reference</title> <style type="text/css"> body { font-family: Verdana, Geneva, Arial, Helvetica, serif; color: #000000; @@ -34,7 +34,7 @@ <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td> <td width="100%"></td></tr></table> -<center><h1>FreeType-2.4.4 API Reference</h1></center> +<center><h1>FreeType-2.4.5 API Reference</h1></center> <center><h1>Table of Contents</h1></center> <br><table align=center width="75%"><tr><td><h2>General Remarks</h2><ul class="empty"><li> @@ -180,6 +180,10 @@ <p>Using LZW-compressed font files.</p> </td></tr> <tr valign=top><td class="left"> +<a href="ft2-bzip2.html">BZIP2 Streams</a></td><td> +<p>Using bzip2-compressed font files.</p> +</td></tr> +<tr valign=top><td class="left"> <a href="ft2-lcd_filtering.html">LCD Filtering</a></td><td> <p>Reduce color fringes of LCD-optimized bitmaps.</p> </td></tr> @@ -211,5 +215,5 @@ <td width="100%"></td> </tr></table> -<center><font size=-2>generated on Sun Nov 28 16:54:32 2010</font></center></body> +<center><font size=-2>generated on Fri Jun 24 13:44:37 2011</font></center></body> </html> |