]> git.sesse.net Git - casparcg/commitdiff
projects / casparcg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f54169b 55a287b)
Merge branch 'master' of https://github.com/CasparCG/Server into 4k-support
authorPeter Karlsson <peter.p.karlsson@svt.se>
Mon, 8 Apr 2013 12:08:26 +0000 (14:08 +0200)
committerPeter Karlsson <peter.p.karlsson@svt.se>
Mon, 8 Apr 2013 12:08:26 +0000 (14:08 +0200)

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