]> git.sesse.net Git - casparcg/commit
Merged trunk.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 30 Jan 2012 12:14:26 +0000 (12:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 30 Jan 2012 12:14:26 +0000 (12:14 +0000)
commitf8c3555d4c3a6e4e157735c086649dda1f411564
tree2185dcd9fd40d583a8697da0b1486fcbe5b6f56d
parentd0fc400b617a14e971d63cba691d067d4d3f4393
Merged trunk.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2171 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
core/mixer/gpu/accelerator.cpp
shell/main.cpp