]> 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>
Thu, 29 Aug 2013 13:49:04 +0000 (15:49 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Thu, 29 Aug 2013 13:49:04 +0000 (15:49 +0200)
commitad66cff9a6a3d35e4765c9ab4289ed0976d52c7b
tree1de012b49edfd4bc8996869b7c392823260fa355
parent5aee090fd729fd556c6ed8075906fe67a4185e67
parent2f790f89abec47bc58b7462e2ce3a6122fbbeff7
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
modules/image/producer/image_producer.cpp
core/producer/text/utils/text_info.h
modules/image/producer/image_producer.cpp