Fixed makefile merge error.

This commit is contained in:
Thulinma 2013-08-26 16:35:31 +02:00
parent 4fb882bdbb
commit ce7c5bc0b9

View file

@ -63,7 +63,8 @@ MistConnHTTPProgressiveFLV_SOURCES=connectors/conn_http_progressive_flv.cpp ../V
MistConnHTTPProgressiveMP3_SOURCES=connectors/conn_http_progressive_mp3.cpp ../VERSION MistConnHTTPProgressiveMP3_SOURCES=connectors/conn_http_progressive_mp3.cpp ../VERSION
MistConnHTTPProgressiveMP4_SOURCES=connectors/conn_http_progressive_mp4.cpp ../VERSION MistConnHTTPProgressiveMP4_SOURCES=connectors/conn_http_progressive_mp4.cpp ../VERSION
MistConnHTTPProgressiveOGG_SOURCES=connectors/conn_http_progressive_ogg.cpp ../VERSION MistConnHTTPProgressiveOGG_SOURCES=connectors/conn_http_progressive_ogg.cpp ../VERSION
MistConnHTTPSRT_SOURCES=connectors/conn_http_srt.cpp ../VERSIONMistConnHTTPDynamic_SOURCES=connectors/conn_http_dynamic.cpp ../VERSION MistConnHTTPSRT_SOURCES=connectors/conn_http_srt.cpp ../VERSION
MistConnHTTPDynamic_SOURCES=connectors/conn_http_dynamic.cpp ../VERSION
MistConnHTTPSmooth_SOURCES=connectors/conn_http_smooth.cpp ../VERSION MistConnHTTPSmooth_SOURCES=connectors/conn_http_smooth.cpp ../VERSION
MistConnHTTPLive_SOURCES=connectors/conn_http_live.cpp ../VERSION MistConnHTTPLive_SOURCES=connectors/conn_http_live.cpp ../VERSION
MistConnTS_SOURCES=connectors/conn_ts.cpp ../VERSION MistConnTS_SOURCES=connectors/conn_ts.cpp ../VERSION