From ce7c5bc0b9cf3cecfb0a477c46e7751bc289090b Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 26 Aug 2013 16:35:31 +0200 Subject: [PATCH] Fixed makefile merge error. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index cf1304bb..feb68bd9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,7 +63,8 @@ MistConnHTTPProgressiveFLV_SOURCES=connectors/conn_http_progressive_flv.cpp ../V MistConnHTTPProgressiveMP3_SOURCES=connectors/conn_http_progressive_mp3.cpp ../VERSION MistConnHTTPProgressiveMP4_SOURCES=connectors/conn_http_progressive_mp4.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 MistConnHTTPLive_SOURCES=connectors/conn_http_live.cpp ../VERSION MistConnTS_SOURCES=connectors/conn_ts.cpp ../VERSION