]> git.sesse.net Git - casparcg/commit
projects / casparcg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5ff3c74) | patch
Manually merged 0edf4e5 (excluding changes to ffmpeg) from master
authorniklaspandersson <niklas.p.andersson@svt.se>
Thu, 29 Aug 2013 13:39:56 +0000 (15:39 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Thu, 29 Aug 2013 13:39:56 +0000 (15:39 +0200)
commit5aee090fd729fd556c6ed8075906fe67a4185e67
tree85d00d687984206cebed06590a762009b11e42f5tree | snapshot
parent5ff3c74171f9a21704a3342bfa70be3b53952588commit | diff
Manually merged 0edf4e5 (excluding changes to ffmpeg) from master
31 files changed:
common/common.vcxproj diff | blob | history
common/common.vcxproj.filters diff | blob | history
common/diagnostics/graph.cpp diff | blob | history
common/diagnostics/graph.h diff | blob | history
common/env.cpp diff | blob | history
common/env.h diff | blob | history
common/filesystem_monitor.h [new file with mode: 0644] blob
common/polling_filesystem_monitor.cpp [new file with mode: 0644] blob
common/polling_filesystem_monitor.h [new file with mode: 0644] blob
core/core.vcxproj diff | blob | history
core/core.vcxproj.filters diff | blob | history
core/producer/frame_producer.cpp diff | blob | history
core/producer/frame_producer.h diff | blob | history
core/producer/separated/separated_producer.cpp diff | blob | history
core/producer/separated/separated_producer.h diff | blob | history
core/producer/text/utils/text_info.h diff | blob | history
core/thumbnail_generator.cpp [new file with mode: 0644] blob
core/thumbnail_generator.h [new file with mode: 0644] blob
modules/image/consumer/image_consumer.cpp diff | blob | history
modules/image/consumer/image_consumer.h diff | blob | history
modules/image/image.cpp diff | blob | history
modules/image/producer/image_producer.cpp diff | blob | history
modules/image/producer/image_producer.h diff | blob | history
protocol/amcp/AMCPCommandsImpl.cpp diff | blob | history
protocol/amcp/AMCPCommandsImpl.h diff | blob | history
protocol/amcp/AMCPProtocolStrategy.cpp diff | blob | history
protocol/amcp/AMCPProtocolStrategy.h diff | blob | history
shell/casparcg.config diff | blob | history
shell/main.cpp diff | blob | history
shell/server.cpp diff | blob | history
shell/server.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.