]> git.sesse.net Git - casparcg/commit
Manually merged a8cbbe3ea46850ad53c25a8e75194c5c1ecbb029 from master
authorHelge Norberg <helge.norberg@svt.se>
Wed, 10 Apr 2013 09:05:01 +0000 (11:05 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Wed, 10 Apr 2013 09:05:01 +0000 (11:05 +0200)
commitebfef78f52164275d28b3e5e4d048bc335bd91a0
tree98cee6d14e489e2eec5f8c93b19d7906e7cd3e67
parent5aa967a16529cbaebf6528a75bc79f241f7b096e
Manually merged a8cbbe3ea46850ad53c25a8e75194c5c1ecbb029 from master
core/mixer/audio/audio_mixer.cpp
core/mixer/audio/audio_mixer.h
core/mixer/mixer.cpp
core/mixer/mixer.h
protocol/amcp/AMCPCommandsImpl.cpp