]> git.sesse.net Git - casparcg/commitdiff
projects / casparcg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93ab044 1d84ce8)
Merge branch '2.1.0' of https://github.com/CasparCG/Server into Branch_dc5575b2004ed4...
authorNiklas P Andersson <niklas.p.andersson@svt.se>
Mon, 14 Dec 2015 13:35:42 +0000 (14:35 +0100)
committerNiklas P Andersson <niklas.p.andersson@svt.se>
Mon, 14 Dec 2015 13:35:42 +0000 (14:35 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.