]> git.sesse.net Git - casparcg/commit
Merge branch 'master' of https://github.com/CasparCG/Server
authorHelge Norberg <helge.norberg@svt.se>
Fri, 12 Apr 2013 18:39:59 +0000 (20:39 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Fri, 12 Apr 2013 18:39:59 +0000 (20:39 +0200)
commit8c9e746e6c0eb90f6b1e89ba66a7cd0a8e4d0801
tree5ba13b7d1320350b251e8be6d6587edadafb0c91
parent44a5538bd2710f36c187b3c68c7b8dda56bcf6d7
parent483ca717825e619e2b212e731156151ffe66ffed
Merge branch 'master' of https://github.com/CasparCG/Server
modules/image/producer/image_producer.cpp
modules/image/util/image_loader.cpp