]> git.sesse.net Git - casparcg/commit
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorJames Wise <james.wise@bluefish444.com>
Fri, 3 Feb 2017 05:22:19 +0000 (16:22 +1100)
committerJames Wise <james.wise@bluefish444.com>
Fri, 3 Feb 2017 05:22:19 +0000 (16:22 +1100)
commit2dc4695df30a20372dc8bf4181cab0a9f5516620
tree777eb5a9c5d78a4050cb7e7b2882ee3b0dbf1da9
parente9af373981017c4567b46c27d1a5f4a998164e07
parent425de351d7cf22599bf73c38aeec7f1c965b24ae
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
shell/casparcg.config