Commit Graph

3 Commits

Author SHA1 Message Date
Brian West cd98ec85e2 fix line endings 2015-05-28 12:46:43 -05:00
Travis Cross 8414c498cf Fix line endings per .gitattributes 2014-08-08 15:24:42 +00:00
Travis Cross d2edcad66e Merge Phil Zimmermann's libzrtp as a FreeSWITCH library
Thanks to Phil Zimmermann for the code and for the license exception
we needed to include it.

There remains some build system integration work to be done before
this code will build properly in the FreeSWITCH tree.
2012-03-31 23:42:27 +00:00