]> 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>
Thu, 11 Jul 2013 10:55:17 +0000 (12:55 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Thu, 11 Jul 2013 10:55:17 +0000 (12:55 +0200)
commit89af3d5145a95575f19ad0fdc9d12ef282713925
tree00c26fdca2f1c0fc6b6dd9b243420453539385fd
parentcbd1394c5ec83b5228f16c2a152ec1c1455116ad
parenta531615fdb6504be13001be9a23a6e27a48fe77c
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
modules/image/util/image_algorithms.cpp
modules/psd/psd.vcxproj
shell/casparcg.config