2 Commits

Author	SHA1	Message	Date
Travis Cross	b7fd94a53e	Fix build of cmockery ... cmockery.h was trying to redefine uintptr_t, but this is already defined in stdint.h.	2013-02-11 16:41:55 +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