Merge branch 'master' of git://git.linphone.org/linphone

This commit is contained in:
Sylvain Berfini 2012-09-12 16:35:34 +02:00
commit 5223b0c7c7
3 changed files with 3 additions and 2 deletions

View file

@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "ortp/port.h"
#include "ortp/b64.h"
#include "ortp/ortp_srtp.h"
#include "sal.h"

@ -1 +1 @@
Subproject commit c6f2baffe88cae29cd846b95269c37b736626fab
Subproject commit 85dee13777a3c62ec25d144b9fbd598c79495a48

2
oRTP

@ -1 +1 @@
Subproject commit 4934d1de87717914042bbed8445a33c192d9d1ef
Subproject commit 6a31e56e1f32f8ca82592e1f4301cd799a9751ea