From: HellGore <helge.norberg@gmail.com>
Date: Thu, 19 Nov 2015 09:48:05 +0000 (+0100)
Subject: Merge pull request #397 from dimitry-ishenko-casparcg/2.1.0-fixes
X-Git-Tag: 2.1.0_Beta1~179
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0fe8d2d7d3d3fe027783ed6a125f74ca9588a045;p=casparcg

Merge pull request #397 from dimitry-ishenko-casparcg/2.1.0-fixes

2.1.0 fixes for gcc 4.9
---

0fe8d2d7d3d3fe027783ed6a125f74ca9588a045