Index: branches/2016Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c
===================================================================
--- branches/2016Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c	(revision 405567)
+++ branches/2016Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c	(nonexistent)
@@ -1,12 +0,0 @@
---- filter/subtitler/load_font.c.orig	2013-12-28 11:40:29.000000000 -0800
-+++ filter/subtitler/load_font.c	2013-12-28 10:44:23.000000000 -0800
-@@ -48,7 +48,7 @@
- #include <ft2build.h>
- #include FT_FREETYPE_H
- 
--#include <freetype/ftglyph.h>
-+#include <freetype2/ftglyph.h>
- 
- /**
-  * @file bswap.h
-

Property changes on: branches/2016Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 405567)
+++ branches/2016Q1	(revision 405568)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r405492