]> git.sesse.net Git - casparcg/commit
Manually merged 4ed9d84d4c06b5a7d8c9f6673134057bff74105e from master
authorHelge Norberg <helge.norberg@svt.se>
Wed, 10 Apr 2013 09:20:33 +0000 (11:20 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Wed, 10 Apr 2013 09:20:33 +0000 (11:20 +0200)
commit3dbbdae25bbe0d7dea4dea5af6f6c3fbca558d7d
tree4f8f374a9ca81cbb4678e629182fc371b48562c9
parentbb84b1958a2ecde9ba7bc48968d67d0d1adb0b95
Manually merged 4ed9d84d4c06b5a7d8c9f6673134057bff74105e from master
modules/screen/consumer/screen_consumer.cpp