summaryrefslogtreecommitdiff
path: root/apps/app_confbridge.c
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-07-28 21:46:27 +0000
committerTerry Wilson <twilson@digium.com>2011-07-28 21:46:27 +0000
commitbe38ebe31644e48feb85b9bfaedb60fe2f5de647 (patch)
treeed7ea016f3dd6c4b47c83cc886cfe3499e37fe10 /apps/app_confbridge.c
parenta3ba55e7c7a725b09317e19ecc863ec7fe68e1b8 (diff)
Merged revisions 330108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r330108 | twilson | 2011-07-28 16:44:31 -0500 (Thu, 28 Jul 2011) | 9 lines Merged revisions 330107 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r330107 | twilson | 2011-07-28 16:42:41 -0500 (Thu, 28 Jul 2011) | 2 lines Make console colors work for TERM=xterm-256color ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_confbridge.c')
0 files changed, 0 insertions, 0 deletions