From da92619552026d251e3d432ce213f96c5b8f3386 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 3 Mar 2011 13:20:03 +0100 Subject: [PATCH] ready for 3.4.2 --- NEWS | 4 ++++ configure.ac | 2 +- linphone-deps.filelist | 4 ++-- mediastreamer2 | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index a684b44af..687b27f98 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +linphone-3.4.2 -- March 3rd, 2011 + * fix problems with webcams on windows + Requires mediastreamer-2.7.2 + linphone-3.4.1 -- February 17th, 2011 * bugfixes * gtk executable is renamed "linphone" (was linphone-3 before) diff --git a/configure.ac b/configure.ac index 0615cc48f..d9f9efcc1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.4.1],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.4.2],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) diff --git a/linphone-deps.filelist b/linphone-deps.filelist index 19ea6ecde..22e069ed8 100755 --- a/linphone-deps.filelist +++ b/linphone-deps.filelist @@ -1,8 +1,8 @@ ./bin/avcodec-52.dll ./bin/avutil-50.dll ./bin/libeXosip2-6.dll -./bin/libogg.dll -./bin/libtheora.dll +./bin/libogg-0.dll +./bin/libtheora-0.dll ./bin/libxml2-2.dll ./bin/libosip2-6.dll ./bin/libosipparser2-6.dll diff --git a/mediastreamer2 b/mediastreamer2 index 9412db625..ce716b126 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9412db625a9f00e6de4c612dbc69ab1f98822d63 +Subproject commit ce716b12627c2d3d92f1559e6dea211f3a455923