]> git.sesse.net Git - casparcg/commit
Merge branch 'master' of https://github.com/CasparCG/Server
authorHelge Norberg <helge.norberg@gmail.com>
Tue, 18 Jun 2013 13:05:56 +0000 (15:05 +0200)
committerHelge Norberg <helge.norberg@gmail.com>
Tue, 18 Jun 2013 13:05:56 +0000 (15:05 +0200)
commit1b9684c05e396af168ac91a1cef8e318c3a57ef9
treeb24581967c52cad1a91928096fc1ba5353ebb110
parentd095afe51c53cbf5a80eb1989b230aa1bef5bd0a
parent37df350eaa5dd2d9a4c03c4edfda6a2e8fe15db3
Merge branch 'master' of https://github.com/CasparCG/Server

Conflicts:
core/core.vcxproj
core/core.vcxproj.filters
core/core.vcxproj
core/core.vcxproj.filters
core/producer/stage.cpp
core/producer/stage.h
protocol/amcp/AMCPCommandsImpl.cpp