ref: 461cc9365c80559e65993cfb3adfc0f832b62055
parent: 71f242c26ace99cdebecb9fdda0a580da89e3112
parent: e2fa4a6c899a4b81c2bda747195899450d5266ed
author: Infinality <[email protected]>
date: Sun Dec 16 15:02:42 EST 2012
Merge branch 'master' of ssh://git.sv.nongnu.org/srv/git/freetype/freetype2 Conflicts: src/truetype/ttinterp.c
--- 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 */