]> git.sesse.net Git - casparcg/commit
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorniklaspandersson <niklas.p.andersson@svt.se>
Wed, 7 Aug 2013 08:25:14 +0000 (10:25 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Wed, 7 Aug 2013 08:25:14 +0000 (10:25 +0200)
commit13dc8b4e87d3e41b24536eb182f222fcdc3a3205
tree247a014a6b7d1fa95c9787fa0f40754d354626b2
parentb415a3f045afbb0171d1ead877edd25a3c6d5945
parent007820a31f22fa048d149828877a20db6298b149
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
core/producer/text/text_producer.cpp
core/producer/text/text_producer.h