diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:49:45 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:49:45 -0500 |
| commit | 09114052f74fe74bbf652189cedefe41b7141b86 (patch) | |
| tree | 6814977399b53176a53efc7ef5dffda1643b9d27 /pjmedia/src/pjmedia/transport_srtp.c | |
| parent | 1873b7a03a08b00140610d531bb6c0bb71e0e91a (diff) | |
| parent | 1ab0bfe2d710db21587a9bf6c01b2392d5bd8ac7 (diff) | |
Merge branch 'patch/shared-libraries' of github.com:asterisk/pjproject
Conflicts:
aconfigure
build/rules.mak
Diffstat (limited to 'pjmedia/src/pjmedia/transport_srtp.c')
0 files changed, 0 insertions, 0 deletions