]> git.sesse.net Git - casparcg/commit
manually merged 44a5538 from master
authorniklaspandersson <niklas.p.andersson@svt.se>
Mon, 2 Sep 2013 07:49:59 +0000 (09:49 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Mon, 2 Sep 2013 07:49:59 +0000 (09:49 +0200)
commitf292471ce40f0cc0a6f09d968eebb3616b7ab7c9
tree195d469ae14b5291e37ce6b44a2ae604d5ff14dc
parent1bbaf3a97e039f83854b7d0cbfe58086d8f597ab
manually merged 44a5538 from master
common/base64.cpp [new file with mode: 0644]
common/base64.h [new file with mode: 0644]
common/common.vcxproj
common/common.vcxproj.filters
core/producer/frame_producer.cpp
modules/image/producer/image_producer.cpp
protocol/amcp/AMCPCommandsImpl.cpp
protocol/util/strategy_adapters.h