git.sesse.net Git - casparcg/commit

]> git.sesse.net Git - casparcg/commit

author	niklaspandersson <niklas.p.andersson@svt.se>
	Wed, 9 Oct 2013 07:57:59 +0000 (09:57 +0200)
committer	niklaspandersson <niklas.p.andersson@svt.se>
	Wed, 9 Oct 2013 07:57:59 +0000 (09:57 +0200)
commit	28d3e7c5efbf12eb494650aeb31d1a379befff21
tree	95fa724a922f042cc29e0d3e4f6c1a147b58200d	tree \| snapshot
parent	ff484db284f973c33bacf87c464e185c4f88a2d6	commit \| diff

manually merged a72be89 from master

58 files changed:

core/consumer/frame_consumer.cpp		diff \| blob \| history
core/consumer/frame_consumer.h		diff \| blob \| history
core/consumer/output.cpp		diff \| blob \| history
core/consumer/output.h		diff \| blob \| history
core/consumer/port.cpp		diff \| blob \| history
core/consumer/port.h		diff \| blob \| history
core/monitor/monitor.cpp		diff \| blob \| history
core/monitor/monitor.h		diff \| blob \| history
core/producer/color/color_producer.cpp		diff \| blob \| history
core/producer/draw/freehand_producer.cpp		diff \| blob \| history
core/producer/frame_producer.cpp		diff \| blob \| history
core/producer/frame_producer.h		diff \| blob \| history
core/producer/layer.cpp		diff \| blob \| history
core/producer/layer.h		diff \| blob \| history
core/producer/scene/const_producer.cpp		diff \| blob \| history
core/producer/scene/hotswap_producer.cpp		diff \| blob \| history
core/producer/scene/hotswap_producer.h		diff \| blob \| history
core/producer/scene/scene_producer.cpp		diff \| blob \| history
core/producer/scene/scene_producer.h		diff \| blob \| history
core/producer/separated/separated_producer.cpp		diff \| blob \| history
core/producer/stage.cpp		diff \| blob \| history
core/producer/stage.h		diff \| blob \| history
core/producer/text/text_producer.cpp		diff \| blob \| history
core/producer/text/text_producer.h		diff \| blob \| history
core/producer/transition/transition_producer.cpp		diff \| blob \| history
core/video_channel.cpp		diff \| blob \| history
core/video_channel.h		diff \| blob \| history
modules/bluefish/consumer/bluefish_consumer.cpp		diff \| blob \| history
modules/decklink/consumer/decklink_consumer.cpp		diff \| blob \| history
modules/decklink/interop/DeckLinkAPI.idl	[deleted file]	blob \| history
modules/decklink/interop/DeckLinkAPI_h.h		diff \| blob \| history
modules/decklink/interop/DeckLinkAPI_i.c		diff \| blob \| history
modules/decklink/interop/DeckLinkAPI_v7_1.idl	[deleted file]	blob \| history
modules/decklink/interop/DeckLinkAPI_v7_3.idl	[deleted file]	blob \| history
modules/decklink/interop/DeckLinkAPI_v7_6.idl	[deleted file]	blob \| history
modules/decklink/interop/DeckLinkAPI_v7_9.idl	[deleted file]	blob \| history
modules/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/ffmpeg/consumer/ffmpeg_consumer.cpp		diff \| blob \| history
modules/ffmpeg/producer/audio/audio_decoder.cpp		diff \| blob \| history
modules/ffmpeg/producer/audio/audio_decoder.h		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/video/video_decoder.cpp		diff \| blob \| history
modules/ffmpeg/producer/video/video_decoder.h		diff \| blob \| history
modules/flash/producer/cg_proxy.cpp		diff \| blob \| history
modules/flash/producer/cg_proxy.h		diff \| blob \| history
modules/flash/producer/flash_producer.cpp		diff \| blob \| history
modules/image/consumer/image_consumer.cpp		diff \| blob \| history
modules/image/producer/image_producer.cpp		diff \| blob \| history
modules/image/producer/image_scroll_producer.cpp		diff \| blob \| history
modules/oal/consumer/oal_consumer.cpp		diff \| blob \| history
modules/reroute/producer/reroute_producer.cpp		diff \| blob \| history
modules/screen/consumer/screen_consumer.cpp		diff \| blob \| history
protocol/osc/server.cpp		diff \| blob \| history
protocol/osc/server.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.

RSS Atom