]> 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>
Thu, 3 Dec 2015 10:21:44 +0000 (11:21 +0100)
committerHelge Norberg <helge.norberg@svt.se>
Thu, 3 Dec 2015 10:21:44 +0000 (11:21 +0100)
commitb0d84593fb82226ea49a1d56aa319e924cdc369a
tree8e5b5d92a3dfa9839f5cca38ee8ee0ffb0b116de
parent473dc1b0cf6914ec8e7a08168c433c8e2c2eb025
parent2b4003a5f134194e94414e2d4ef53ed9e3e03443
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0