Skip to content
Snippets Groups Projects
Commit 41eba638 authored by Automerge script's avatar Automerge script
Browse files

Merged revisions 378854,378858-378859 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

........
  r378854 | rmudgett | 2013-01-09 17:22:00 -0600 (Wed, 09 Jan 2013) | 1 line
  
  Fix logger.c function definition.
........
  r378858 | rmudgett | 2013-01-09 17:23:41 -0600 (Wed, 09 Jan 2013) | 6 lines
  
  Trivial misc bridge code changes.
  
  * softmix_bridge_thread() was redundantly initializing an 8K buffer.
  
  * Promoted a debug message to a warning in multiplexed_add_or_remove().
........
  r378859 | rmudgett | 2013-01-09 17:51:45 -0600 (Wed, 09 Jan 2013) | 6 lines
  
  * Simple optimization of bridge_playfile().
  
  * Squeezed some redundancy out of update_bridge_vars().
  
  * Wrapped long line in __ast_change_name_nolink().
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent e844969f
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment