From 26f0cd94c85a88f73738ffa432e8dea6cef9daf9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 7 May 2010 21:53:02 +0200
Subject: [PATCH] enhance .gitignores

---
 .gitignore     | 11 +++++++++++
 mediastreamer2 |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1473464cd..7de3a426a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,15 @@ msx264.iss
 linphone-install
 buddylookup-install
 msx264-install
+*.tar.gz
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+INSTALL
+Specfile
+.anjuta/
+.anjuta_sym_db.db
+coreapi/help/doxygen.dox
+gtk-glade/version_date.h
+share/linphone.desktop
 
diff --git a/mediastreamer2 b/mediastreamer2
index 5b8a7c368..f315bd22f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5b8a7c368076733d478aa7e49149975915408483
+Subproject commit f315bd22ffbbe9a07d079c2859ea67e831f94e52