From 24b6494d7c1ee305af42a597460f7656a6e72a93 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 26 Jan 2011 13:14:15 +0100
Subject: [PATCH 1/3] update ms2

---
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index fa8cbea18..664e9338c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fa8cbea18aae52d4bafc948687d678dfe453b628
+Subproject commit 664e9338cf0f963ef6ab6caad9679abcdfeb60c9
diff --git a/oRTP b/oRTP
index 37c60a638..c8b487f32 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 37c60a638fd108404ca437e2bbef78f227178450
+Subproject commit c8b487f32fe225f8b1961754db9140eb282a0d28

From 2cbfc471081fdd61ec8f5af3a15c42dfa3911471 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 27 Jan 2011 12:09:08 +0100
Subject: [PATCH 2/3] update ms

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 664e9338c..021159970 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 664e9338cf0f963ef6ab6caad9679abcdfeb60c9
+Subproject commit 021159970deaa9f1ec9a3a912c4b2fb48400f044

From aba5cc518c76cd685973fa0dd092faddeccb039e Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 26 Jan 2011 10:34:25 +0100
Subject: [PATCH 3/3] Comment out dangling sipomatic references, fixing
 automake warning

---
 console/Makefile.am | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/console/Makefile.am b/console/Makefile.am
index cf6a336ed..53d91b7b8 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -33,16 +33,16 @@ linphoned_LDADD=$(linphonec_LDADD)
 endif
 
 
-sipomatic_SOURCES=\
-	sipomatic.c sipomatic.h
-sipomatic_CFLAGS= $(COMMON_CFLAGS) $(CONSOLE_FLAGS)
-
-sipomatic_LDADD= 	$(INTLLIBS)  \
-			$(top_builddir)/coreapi/liblinphone.la \
-			$(MEDIASTREAMER_LIBS) \
-			$(ORTP_LIBS) \
-			$(SPEEX_LIBS) \
-			$(OSIP_LIBS)
+#sipomatic_SOURCES=\
+#	sipomatic.c sipomatic.h
+#sipomatic_CFLAGS= $(COMMON_CFLAGS) $(CONSOLE_FLAGS)
+#
+#sipomatic_LDADD= 	$(INTLLIBS)  \
+#			$(top_builddir)/coreapi/liblinphone.la \
+#			$(MEDIASTREAMER_LIBS) \
+#			$(ORTP_LIBS) \
+#			$(SPEEX_LIBS) \
+#			$(OSIP_LIBS)
 
 linphonecsh_SOURCES = shell.c
 linphonecsh_CFLAGS = $(CONSOLE_FLAGS)