]> git.sesse.net Git - casparcg/commit
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorHelge Norberg <helge.norberg@svt.se>
Fri, 23 Aug 2013 20:10:28 +0000 (22:10 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Fri, 23 Aug 2013 20:10:28 +0000 (22:10 +0200)
commit4607f689b2cc7a20a33aa1e98eadfb30d57ca45a
tree63c61a7917b9f3415143a8d7bfe45c63f8ae52c6
parent1b45ff657810fa84af77eb8e2809079e7e29e27a
parentafa5a58477cd443ad374cd673b2d0bf22ba4e594
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
core/core.vcxproj.filters
core/core.vcxproj
core/core.vcxproj.filters
core/producer/text/text_producer.cpp
core/producer/text/text_producer.h