]> git.sesse.net Git - casparcg/commit
Merge branch 'master' of https://github.com/ronag/Server into master
authorHelge Norberg <helge.norberg@svt.se>
Mon, 15 Apr 2013 10:58:24 +0000 (12:58 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Mon, 15 Apr 2013 10:58:24 +0000 (12:58 +0200)
commitf87d6f8bf4c5e5a2f2b7f34e22fe7d685fdb3a56
tree4ba060431916f7c7d4c78ef1690c02190bbb21ae
parenta72be896aa213360a5897ca5d3a15b29bb7327d8
Merge branch 'master' of https://github.com/ronag/Server into master
core/producer/playlist/playlist_producer.cpp [deleted file]
core/producer/playlist/playlist_producer.h [deleted file]