]> git.sesse.net Git - casparcg/commitdiff
projects / casparcg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9af373 425de35)
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)
1  2 
shell/casparcg.config patch | diff1 | diff2 | blob | history

diff --cc shell/casparcg.config
Simple merge
Unnamed repository; edit this file 'description' to name the repository.