diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
| commit | af93a26aa321d3620925e5df68574226ba6cec3c (patch) | |
| tree | c73301bfef50ae9ba250285bbcc7879f5c837e04 /svn_pset | |
| parent | 09114052f74fe74bbf652189cedefe41b7141b86 (diff) | |
| parent | 9550ec7a68b8d072f99872d44def5004dbcc2562 (diff) | |
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject
Conflicts:
build.mak.in
Diffstat (limited to 'svn_pset')
0 files changed, 0 insertions, 0 deletions