]> 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:16:57 +0000 (18:16 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Tue, 13 Aug 2013 07:45:24 +0000 (09:45 +0200)
commit4fe4692485eed8151acf9a731e3d49d1b84649c3
tree640d30fd27742187bed9c00460e8251eb01a9ab4
parent52ec6eb600439392872d60b1505f85fb79203173
parentbf84bf11d78e65a331ecc8bc2055247a578050d6
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/amcp/amcp_shared.h
protocol/util/lock_container.cpp
protocol/util/lock_container.h