From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 27 Mar 2013 19:05:25 +0000 (+0100)
Subject: use git describe --always
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=81475cbdae3c589390b2e40cb1fd2409b44ee810

use git describe --always
---

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index bef0613b..91fc9bd2 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -1,6 +1,6 @@
 GITVERSION_FILE=liblinphone_gitversion.h
 GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
-GITDESCRIBE=`git describe`
+GITDESCRIBE=`git describe --always`
 GITREVISION=`git rev-parse HEAD`
 
 ECHO=/bin/echo
diff --git a/mediastreamer2 b/mediastreamer2
index 5a7ae95e..8596ed90 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5a7ae95e0dbe5f485086d4635a655c893c9c44b1
+Subproject commit 8596ed9017c0d9b9c63c758d7628bac1fc07efd7