aboutsummaryrefslogtreecommitdiffstats
path: root/bridges/bridge_softmix.c
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-05 15:06:59 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-05 15:06:59 +0000
commitf0e5afee46b523c2abb5e9a00da53b6e49272af2 (patch)
tree721fe333512df50cbc1bef356703e3132b56797e /bridges/bridge_softmix.c
parentaed2cc7cd148eb18135cbc97539841681d047356 (diff)
Merged revisions 317104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r317104 | lmadsen | 2011-05-05 11:04:24 -0400 (Thu, 05 May 2011) | 15 lines Merged revisions 317102 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r317102 | lmadsen | 2011-05-05 10:54:46 -0400 (Thu, 05 May 2011) | 8 lines Disable console colourization inside safe_asterisk checks. (closes issue #19213) Reported by: lefoyer Patches: issue19213_strip_color_in_safe_asterisk-svn.patch uploaded by wdoekes (license 717) Tested by: wdoekes, lefoyer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317105 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'bridges/bridge_softmix.c')
0 files changed, 0 insertions, 0 deletions