git.sesse.net Git - casparcg/commit

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

projects / casparcg / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: f292471) | patch

author	niklaspandersson <niklas.p.andersson@svt.se>
	Tue, 3 Sep 2013 08:08:17 +0000 (10:08 +0200)
committer	niklaspandersson <niklas.p.andersson@svt.se>
	Tue, 3 Sep 2013 08:08:17 +0000 (10:08 +0200)
commit	ff484db284f973c33bacf87c464e185c4f88a2d6
tree	18ba0791d6c1987598463553d87fec0b925f759e	tree \| snapshot
parent	f292471ce40f0cc0a6f09d968eebb3616b7ab7c9	commit \| diff

manually merged 4a2171b from master
manually merged 0c06544 from master
manually merged 8d99a50 from master

19 files changed:

core/consumer/frame_consumer.cpp		diff \| blob \| history
core/consumer/output.cpp		diff \| blob \| history
core/consumer/port.cpp		diff \| blob \| history
core/consumer/port.h		diff \| blob \| history
core/mixer/audio/audio_mixer.cpp		diff \| blob \| history
core/video_format.cpp		diff \| blob \| history
core/video_format.h		diff \| blob \| history
modules/bluefish/consumer/bluefish_consumer.cpp		diff \| blob \| history
modules/decklink/consumer/decklink_consumer.cpp		diff \| blob \| history
modules/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/muxer/frame_muxer.cpp		diff \| blob \| history
modules/oal/consumer/oal_consumer.cpp		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.cpp		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.h		diff \| blob \| history
protocol/amcp/AMCPProtocolStrategy.cpp		diff \| blob \| history
shell/casparcg_auto_restart.bat	[new file with mode: 0644]	blob
shell/main.cpp		diff \| blob \| history
shell/shell.vcxproj		diff \| blob \| history
shell/shell.vcxproj.filters		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.