]> 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>
Mon, 12 Aug 2013 16:04:37 +0000 (18:04 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Mon, 12 Aug 2013 16:04:37 +0000 (18:04 +0200)
commit52ec6eb600439392872d60b1505f85fb79203173
treedbe1c4e07300063cf7b51c7c9a9aa88b33ef1589
parentaf9712801c6f09cfb1ba9429d43818af9e4090a4
parent53e85c272ee4de4efb3d454441eaa53bbc0d4c26
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
protocol/amcp/AMCPProtocolStrategy.cpp