git.sesse.net Git - casparcg/commit

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

author	Helge Norberg <helge.norberg@svt.se>
	Mon, 15 Apr 2013 10:19:57 +0000 (12:19 +0200)
committer	Helge Norberg <helge.norberg@svt.se>
	Mon, 15 Apr 2013 10:19:57 +0000 (12:19 +0200)
commit	a72be896aa213360a5897ca5d3a15b29bb7327d8
tree	b24db626c7164481b1372ee8d59b92522d755095	tree \| snapshot
parent	8c9e746e6c0eb90f6b1e89ba66a7cd0a8e4d0801	commit \| diff

Merge branch 'master' of https://github.com/ronag/Server into master

43 files changed:

core/core.vcxproj		diff \| blob \| history
core/core.vcxproj.filters		diff \| blob \| history
core/monitor/monitor.cpp	[new file with mode: 0644]	blob
core/monitor/monitor.h	[new file with mode: 0644]	blob
core/producer/channel/channel_producer.cpp		diff \| blob \| history
core/producer/color/color_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/separated/separated_producer.cpp		diff \| blob \| history
core/producer/stage.cpp		diff \| blob \| history
core/producer/stage.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/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.cpp		diff \| blob \| history
modules/flash/producer/cg_producer.cpp		diff \| blob \| history
modules/flash/producer/cg_producer.h		diff \| blob \| history
modules/flash/producer/flash_producer.cpp		diff \| blob \| history
modules/image/producer/image_producer.cpp		diff \| blob \| history
modules/image/producer/image_scroll_producer.cpp		diff \| blob \| history
protocol/osc/oscpack/MessageMappingOscPacketListener.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscException.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscHostEndianness.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscOutboundPacketStream.cpp	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscOutboundPacketStream.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscPacketListener.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscPrintReceivedElements.cpp	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscPrintReceivedElements.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscReceivedElements.cpp	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscReceivedElements.h	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscTypes.cpp	[new file with mode: 0644]	blob
protocol/osc/oscpack/OscTypes.h	[new file with mode: 0644]	blob
protocol/osc/server.cpp	[new file with mode: 0644]	blob
protocol/osc/server.h	[new file with mode: 0644]	blob
protocol/protocol.vcxproj		diff \| blob \| history
protocol/protocol.vcxproj.filters		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