]> 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>
Fri, 16 Aug 2013 14:34:16 +0000 (16:34 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Fri, 16 Aug 2013 14:35:45 +0000 (16:35 +0200)
commit10a292c992019b0357440bf5e8bb12674de3914f
treeaa04799b4ab60b2222d12885fd8a0458ae8a6d04
parent6788472280678f0dc957d04d4ef0ee597620930d
parentd28e709aef633801e8a76742bad054973b6690c3
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
modules/psd/psd_scene_producer.cpp

* added support for solid colors in scene_producer factory
core/producer/color/color_producer.cpp
core/producer/color/color_producer.h
modules/psd/layer.cpp
modules/psd/misc.h
modules/psd/psd_scene_producer.cpp