]> git.sesse.net Git - casparcg/commit
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorniklaspandersson <niklas.p.andersson@svt.se>
Wed, 9 Oct 2013 08:21:14 +0000 (10:21 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Wed, 9 Oct 2013 08:21:14 +0000 (10:21 +0200)
commitc3a76b811579dd3a52227e170903da821c04ae9e
tree087a0340b54bd11993e55b76daef8414dbb2b25a
parent28d3e7c5efbf12eb494650aeb31d1a379befff21
parent92db9171049f8183ab4ca453237e0d1ca1e3a815
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
core/consumer/output.h
core/monitor/monitor.h
core/producer/layer.h
core/producer/stage.h
core/video_channel.h
core/video_format.cpp
shell/server.h
core/producer/layer.h
core/producer/stage.h
core/producer/text/text_producer.cpp
core/video_channel.cpp
core/video_channel.h
core/video_format.h
modules/decklink/producer/decklink_producer.cpp
protocol/amcp/AMCPCommandsImpl.cpp
protocol/amcp/AMCPCommandsImpl.h
protocol/amcp/AMCPProtocolStrategy.cpp
shell/server.h