]> git.sesse.net Git - casparcg/commit
2.0. mixer: Composite local_key with internal_key instead of overriding.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 20 Jun 2011 09:58:50 +0000 (09:58 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 20 Jun 2011 09:58:50 +0000 (09:58 +0000)
commit052c9f5f84457046e59520f67373baa13c0a17e4
tree7b723ba11ff42a53044e07f20a2fd3a98d19f2f7
parent00be18f944a64a0c568ad1ef62cebdb573839d12
2.0. mixer: Composite local_key with internal_key instead of overriding.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@922 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
casparcg.sln
core/mixer/image/image_kernel.cpp