]> git.sesse.net Git - casparcg/commit
Manually merged 1e8f06f8dbd1f5c4f447c1bc60a60e600ad1b942 from master
authorHelge Norberg <helge.norberg@svt.se>
Tue, 9 Apr 2013 08:10:44 +0000 (10:10 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Tue, 9 Apr 2013 08:10:44 +0000 (10:10 +0200)
commitc23914b128e0b3ae5dba197c7c034faa76d6cc67
tree794f05f15189c984c71d8ffb7f2bc7925dcba3fb
parented55dbef3f948b0b69ce88c06563bbc848d11a17
Manually merged 1e8f06f8dbd1f5c4f447c1bc60a60e600ad1b942 from master
core/mixer/mixer.cpp
core/mixer/mixer.h
protocol/amcp/AMCPCommandsImpl.cpp