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

Conflicts:
	src/truetype/ttinterp.c
2.6.5
Infinality 12 years ago
commit 461cc9365c
  1. 1
      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 */

Loading…
Cancel
Save