]> git.sesse.net Git - casparcg/commit
Merged from trunk
authorhellgore <hellgore@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 14 Jun 2012 17:31:18 +0000 (17:31 +0000)
committerhellgore <hellgore@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 14 Jun 2012 17:31:18 +0000 (17:31 +0000)
commitff8425f00ec870dec6ab0db2a8059fed3f4ce646
tree7161b358ea2833f010cb7b03ed87e6a12f3cd34b
parent8e2c8cb2f24f55f2e8f68cc1ba78dcc62bad64db
Merged from trunk

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@3115 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
common/log.cpp
common/log.h
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/cii/CIIProtocolStrategy.cpp
protocol/util/ClientInfo.h
shell/main.cpp