]> git.sesse.net Git - casparcg/commit
Merge branch 'master' of https://github.com/ronag/Server into ronag-master
authorHelge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
committerHelge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 09:45:36 +0000 (11:45 +0200)
commit44d24e240da3bc2318642eea44721962d45daad3
tree754568e66c24ce7b37875a896b2346b97671e63a
parent3c9605a7741d7cac1e243cf137b8f4892144bc52
parenteb37f0bb33d71f459e8691f74a85ff1f8d98e78d
Merge branch 'master' of https://github.com/ronag/Server into ronag-master
shell/casparcg.config
shell/server.cpp