From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 23 Aug 2013 20:10:28 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~428
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4607f689b2cc7a20a33aa1e98eadfb30d57ca45a;p=casparcg

Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
	core/core.vcxproj.filters
---

4607f689b2cc7a20a33aa1e98eadfb30d57ca45a
diff --cc core/core.vcxproj.filters
index 83dc27134,a0d7356a5..788d617cf
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@@ -172,8 -172,8 +172,10 @@@
      <ClInclude Include="producer\variable.h">
        <Filter>source\producer</Filter>
      </ClInclude>
 +    <ClInclude Include="producer\scene\expression_parser.h">
 +      <Filter>source\producer\scene</Filter>
+     <ClInclude Include="producer\text\utils\text_info.h">
+       <Filter>source\producer\text\utils</Filter>
      </ClInclude>
    </ItemGroup>
    <ItemGroup>