]> git.sesse.net Git - casparcg/commit
Another Neptune fix, don't conflict with Hawrys.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 16 Dec 2011 12:14:57 +0000 (12:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 16 Dec 2011 12:14:57 +0000 (12:14 +0000)
commita515d4bd9a9a0732e25f06f61381973afec76139
treeede0393b57ef6c140349ef92885e9a6814144c32
parent12e32b4f96ed6a856da968657ed95aecde7c41c4
Another Neptune fix, don't conflict with Hawrys.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1900 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
protocol/cii/CIICommandsImpl.cpp