From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 25 Feb 2013 09:46:48 +0000 (+0100)
Subject: update ms2 for fixing make distcheck
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=dd7da58c0c91a6575e64f6533f4efa2c37fad8ab

update ms2 for fixing make distcheck
---

diff --git a/Makefile.am b/Makefile.am
index 507e6f4d..f871d46a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,17 +48,17 @@ ISCC=ISCC.exe
 PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist
 PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle
 
-EXTRA_DIST = config.rpath  BUGS linphone.kdevelop  \
-				README.arm \
-				README.mingw \
-				README.macos \
-				autogen.sh \
-				linphone.spec \
-				linphone.spec.in \
-				$(GTK_FILELIST) \
-				gen-gtkfilelist.sh \
-				$(LINPHONEDEPS_FILELIST) \
-				$(ISS_SCRIPT).in
+EXTRA_DIST =		BUGS  \
+			README.arm \
+			README.mingw \
+			README.macos \
+			autogen.sh \
+			linphone.spec \
+			linphone.spec.in \
+			$(GTK_FILELIST) \
+			gen-gtkfilelist.sh \
+			$(LINPHONEDEPS_FILELIST) \
+			$(ISS_SCRIPT).in
 
 DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
 
diff --git a/mediastreamer2 b/mediastreamer2
index c48f1a31..e033b06a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit c48f1a31d850ed9a1b607985d2a250a8ca048547
+Subproject commit e033b06a731d0b9bc4e69afc690f6469eae73f66