Merge branch 'master' of ssh://git.sv.nongnu.org/srv/git/freetype/freetype2

Conflicts: src/truetype/ttinterp.c
2012-12-16 20:02:42 -06:00 · 2012-12-16 20:02:42 -06:00 · 461cc9365c
parent 71f242c26a e2fa4a6c89
commit 461cc9365c
1 changed files with 0 additions and 1 deletions
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@ -4610,7 +4610,6 @@
    FT_ULong       n;
    TT_DefRecord*  rec;
    TT_DefRecord*  limit;
-
 #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
    FT_Byte    opcode_pattern[7][12] = {
                 /* inline delta function 1 */