From 85c3a634802a7613b06c47b2ab1ecdad3e74afcf Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 18 Feb 2013 16:20:48 +0100 Subject: [PATCH] fix wrong merge --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index a964bf24c..73a772ac4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit a964bf24c47febe55276a8b5ef3e323503c08668 +Subproject commit 73a772ac4754734c57ecbc1149cbe665acd2f376