]> git.sesse.net Git - casparcg/commit
2.1.0:
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 16 Dec 2011 22:48:13 +0000 (22:48 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 16 Dec 2011 22:48:13 +0000 (22:48 +0000)
commita875548a2421ed28ab0084cfc34d376b657d38e5
tree824ac07ffd53dc6a8f608b6867f61bf93b673117
parent7930b37f8ea94a9c8f0877744baac7cc34458ff8
2.1.0:
Merged revision(s) 1898-1900 from server/trunk:
Fixed Neptune support.
........

........
Another Neptune fix, don't conflict with Hawrys.
........

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@1901 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
core/video_channel.cpp
modules/flash/producer/cg_producer.cpp
protocol/cii/CIICommandsImpl.cpp
protocol/cii/CIIProtocolStrategy.cpp