]> sjero.net Git - linphone/commit
srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 13 Oct 2011 08:58:04 +0000 (10:58 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 13 Oct 2011 08:58:04 +0000 (10:58 +0200)
commit01438658f459dceec8810dcb1344c61bfdee7d2b
tree6517cac4dad3bbe09508f60c546943e16888a774
parentc3ce65e8021c38dc876617aa6cec2eecb226a93c
srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h

Conflicts:

coreapi/sal.h
coreapi/sal_eXosip2_sdp.c
mediastreamer2
oRTP
coreapi/sal.h
coreapi/sal_eXosip2_sdp.c
mediastreamer2
oRTP