Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC. Forced to Jaron's style, for now. May change later.

Browse source

Conflicts:
	Buffer/Makefile
	Connector_HTTP/Makefile
	Connector_RAW/Makefile
	Connector_RTMP/Makefile

...

This commit is contained in:

Thulinma 2012-04-27 21:11:10 +02:00

parent 2701a0be46 fed61efd80

commit fffcf598c4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available