Merged revisions 377594-377595 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Mon, 10 Dec 2012 07:19:34 +0000 (07:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Mon, 10 Dec 2012 07:19:34 +0000 (07:19 +0000)
commit58f0ade4db08772c01eb83571c42327eab261b29
tree3109509ef60b9fe45c2cdec0bbef0aa2b503f757
parentdb0e7049ac1b9ff08c2d7ba03fef7ea0f4ca5921
Merged revisions 377594-377595 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377594 | igorg | 2012-12-10 00:56:04 -0600 (Mon, 10 Dec 2012) | 15 lines

  Fix codec mismatch

  Fix code to send in both rx and tx open stream messages correct codecs. Found that on phase 0/1 phones wrong codecs cause to no audio in some situations.

  (issue ASTERISK-20183)
  ........

  Merged revisions 377591 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 377592 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377593 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r377595 | igorg | 2012-12-10 01:03:48 -0600 (Mon, 10 Dec 2012) | 3 lines

  Add firmware information to CLI devices listing
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_unistim.c