2 Commits

Author	SHA1	Message	Date
Michiel van Baak	9dab42b819	Merged revisions 175952 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r175952 | mvanbaak | 2009-02-16 01:26:59 +0100 (Mon, 16 Feb 2009) | 10 lines Merged revisions 175921 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r175921 | mvanbaak | 2009-02-16 00:37:03 +0100 (Mon, 16 Feb 2009) | 3 lines fix mis-spelling of the word registered. Reported by De_Mon on #asterisk-dev. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176023 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2009-02-16 09:42:46 +00:00
Russell Bryant	267683eb19	Merge the code from asterisk/team/group/chan_unistim: ... This introduces a new channel driver, chan_unistim, that supports the Unistim VoIP protocol for Nortel phones. The following models have been confirmed to work: i2002, i2004 and i2050. (closes issue #8864) Reported by: c_hans Patches: chan_unistim.patch uploaded by c (license 304) ustm_no_conf.diff uploaded by junky (license 177) Tested by: c_hans, dbowerman, math, junky, loloski git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88368 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-11-02 20:56:12 +00:00