]> git.sesse.net Git - casparcg/commit
Manually merged 44adc50 from master
authorniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 08:17:45 +0000 (10:17 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 08:17:45 +0000 (10:17 +0200)
commit14f5b90ff1a1905cb26109a551ebed392cf1b38e
tree61b3311d8a678dfb28f55ee95f4ed6e8b2dfe045
parent312eaa73cb4cc55b8116652e47621630e0badd32
Manually merged 44adc50 from master
protocol/amcp/AMCPCommandsImpl.cpp
protocol/amcp/AMCPCommandsImpl.h
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/amcp/AMCPProtocolStrategy.h
shell/main.cpp
shell/server.cpp
shell/server.h