]> git.sesse.net Git - casparcg/commit
manually merged d21afbd from master
authorniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 10:21:13 +0000 (12:21 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 10:21:13 +0000 (12:21 +0200)
commitc830443e3120fe3d6d32df1871c552525163fe60
treef2165a375f4b8eb617bef55e20017b4967223028
parent4c676334864aff847f69261cb945967aec752860
manually merged d21afbd from master
manually merged 483ca71 from master
common/env.cpp
modules/image/producer/image_producer.cpp